|
|
@@ -8,14 +8,14 @@ import sys
|
|
|
import threading
|
|
|
import yaml
|
|
|
sys.path.insert(0, os.getcwd())
|
|
|
-sys.path.insert(1, './../App/')
|
|
|
+sys.path.insert(1, '../App/')
|
|
|
import mkconfig
|
|
|
|
|
|
# The default manifest file
|
|
|
-MANIFEST = "./../App/manifest.yaml"
|
|
|
+MANIFEST = "../App/manifest.yaml"
|
|
|
|
|
|
# The default pubkeys file
|
|
|
-PUBKEYS = "./../App/pubkeys.yaml"
|
|
|
+PUBKEYS = "../App/pubkeys.yaml"
|
|
|
|
|
|
# The client binary
|
|
|
CLIENTS = "./clients"
|
|
|
@@ -29,7 +29,7 @@ def launch(config, cmd, threads, lgfile):
|
|
|
cmdline += prefix + CLIENTS + " -t " + str(threads) + ""
|
|
|
|
|
|
stdout_file = subprocess.PIPE
|
|
|
- if(lgfile):
|
|
|
+ if lgfile:
|
|
|
stdout_file = open(lgfile, "a+")
|
|
|
|
|
|
proc = subprocess.Popen(shlex.split(cmdline) + cmd,
|
|
|
@@ -38,7 +38,7 @@ def launch(config, cmd, threads, lgfile):
|
|
|
print(cmdline)
|
|
|
proc.stdin.write(config.encode('utf-8'))
|
|
|
|
|
|
- if(lgfile):
|
|
|
+ if lgfile:
|
|
|
proc.wait()
|
|
|
stdout_file.close()
|
|
|
else:
|
