From 42d1c3750b6e9dc38646c4e0ff56383fc5b178c6 Mon Sep 17 00:00:00 2001 From: SummerGift Date: Tue, 27 Aug 2019 16:33:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=AE=8C=E5=96=84=E3=80=91?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8D=87=E7=BA=A7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- init_env.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/init_env.py b/init_env.py index d27f52e8..bd7ed32c 100644 --- a/init_env.py +++ b/init_env.py @@ -25,17 +25,22 @@ from multiprocessing import Process import os -import time +import sys + +def run_proc(name, env_root): + exec_file = os.path.join(env_root, "tools\scripts\env.py") -def run_proc(name): - exec_file = os.path.join(os.getcwd(), "tools\scripts\env.py") try: os.system("python %s package --upgrade 1>std_null 2>err_null"%exec_file) except Exception, e: print("Auto upgrade failed, please check your network.") pass -if __name__=='__main__': - p = Process(target=run_proc, args=('upgrade',) ) +def main(): + env_root = sys.argv[1] + p = Process(target=run_proc, args=('upgrade', env_root) ) p.start() p.join() + +if __name__=='__main__': + main() From 7329c84ce669a387bfd4a2746e6d1ad2b78490da Mon Sep 17 00:00:00 2001 From: SummerGift Date: Tue, 27 Aug 2019 16:39:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=20env=20root=20=E7=B3=BB=E7=BB=9F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- init_env.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init_env.py b/init_env.py index bd7ed32c..73d26925 100644 --- a/init_env.py +++ b/init_env.py @@ -37,8 +37,8 @@ def run_proc(name, env_root): pass def main(): - env_root = sys.argv[1] - p = Process(target=run_proc, args=('upgrade', env_root) ) + env_root = env_root = os.getenv("ENV_ROOT") + p = Process(target=run_proc, args=('upgrade', env_root)) p.start() p.join()