BugsFix

1.修复安装脚本逻辑错误
2.main.py功能测试完毕

Author: egoleecode

Cli-Tools/main.py

@@ -1,31 +1,32 @@
-# -*- coding: utf-8 -*-
 #!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
 import json
 import os
 import random
 import requests
 import subprocess
 
 def get_cid():
-    cid = "localfile"
     cid = input("请输入CID（直接回车导入本地文件）：")
-    if cid == "localfile":
+    if cid == "":
         file_path = input("请输入文件绝对路径：")
         while os.path.exists(file_path) == False:
             print("该路径文件不存在，请重新输入")
         else:
             if os.path.isfile(file_path):
-                ipfs_add_cmd = """ipfs add %s"""
+                ipfs_add_cmd = """ipfs add %s""" % file_path
                 ipfs_cli_output = str(subprocess.check_output(ipfs_add_cmd.split()), "utf-8")
                 cid = ipfs_cli_output.split()[-2]
-            elif os.path.isfile(file_path):
-                ipfs_add_cmd = """ipfs add -r %s"""
+            elif os.path.isdir(file_path):
+                ipfs_add_cmd = """ipfs add -r %s""" % file_path
                 ipfs_cli_output = str(subprocess.check_output(ipfs_add_cmd.split()), "utf-8")
                 cid = ipfs_cli_output.split()[-2]
             else:
                 pass
     else:
         pass
+    print("已获取到CID：%s" % cid)
     return cid
 
 def get_vshare_nodeid():
@@ -48,7 +49,8 @@ def ipfs_gc(cid):
 cid = get_cid()
 if mode == "1":
     minerid = get_vshare_nodeid()
-    subprocess.run("expect /opt/vsharecloud-tools/scripts/single_deal.sh %s %s %s" % (cid, deal_duration, minerid), shell=True)
+    cmd = "expect /opt/vsharecloud-tools/scripts/single_deal.sh %s %s %s" % (cid, deal_duration, minerid)
+    subprocess.run(cmd, shell=True)
     print("交易已发起，请通过命令 lotus client list-deals 查询交易状态")
     if_gc = input("是否清理刚刚导入的文件缓存？(y/n)")
     if if_gc == "y":
@@ -58,7 +60,8 @@ def ipfs_gc(cid):
     exit()
 elif mode == "2":
     minerid = input("请输入FileCoin节点ID（格式：f0xxxxx）：")
-    subprocess.run("expect /opt/vsharecloud-tools/scripts/single_deal.sh %s %s %s" % (cid, deal_duration, minerid), shell=True)
+    cmd = "expect /opt/vsharecloud-tools/scripts/single_deal.sh %s %s %s" % (cid, deal_duration, minerid)
+    subprocess.run(cmd, shell=True)
     print("交易已发起，请通过命令 lotus client list-deals 查询交易状态")
     if_gc = input("是否清理刚刚导入的文件缓存？(y/n)")
     if if_gc == "y":
@@ -69,7 +72,8 @@ def ipfs_gc(cid):
 elif mode == "3":
     deal_times = input("请输入本次发起的交易次数（纯数字）：")
     max_budget = input("请输入最大的价格预算（纯数字）")
-    subprocess.run("expect /opt/vsharecloud-tools/scripts/global_deal.sh %s %s %s %s" % (cid, deal_duration, max_budget, deal_times), shell=True)
+    cmd = "expect /opt/vsharecloud-tools/scripts/global_deal.sh %s %s %s %s" % (cid, deal_duration, max_budget, deal_times)
+    subprocess.run(cmd, shell=True)
     print("交易已发起，请通过命令 lotus client list-deals 查询交易状态")
     if_gc = input("是否清理刚刚导入的文件缓存？(y/n)")
     if if_gc == "y":

Shell-Script/install.sh

@@ -70,7 +70,7 @@ if [[ ${release} == "centos" ]]; then
     sudo yum install wget gcc python3 python3-pip mariadb-devel python3-devel expect -y
     sudo yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm; sudo yum install -y git gcc bzr jq pkgconfig clang llvm mesa-libGL-devel opencl-headers ocl-icd ocl-icd-devel hwloc-devel
 else
-    sudo apt install mesa-opencl-icd ocl-icd-opencl-dev gcc git bzr jq pkg-config curl clang build-essential hwloc libhwloc-dev libhwloc5 wget python3 python3-pip expect -y
+    sudo apt install mesa-opencl-icd ocl-icd-opencl-dev gcc git bzr jq pkg-config curl clang build-essential hwloc libhwloc-dev wget python3 python3-pip expect -y
     sudo apt upgrade -y
 fi
 
@@ -152,9 +152,9 @@ if [ -e /usr/local/bin/lotus ]; then
     rm -rf /opt/vsharecloud-tools/
 fi
 mkdir /opt/vsharecloud-tools
-ipfs get /ipns/vsharecloud-tools.ipns.network/ -o /opt/vsharecloud-tools/
+ipfs get /ipns/vsharecloud-tools.ipns.network/ -o c
 chmod +x /opt/vsharecloud-tools/main.py
-sudo ln -s /usr/lib/vsharecloud-cli /opt/vsharecloud-tools/main.py 
+sudo ln -s /opt/vsharecloud-tools/main.py /usr/bin/vsharecloud-cli
 OUT_INFO "[信息] 安装已完成！"
 
 exit 0