From af602f1c0f2e10deec0e660c1634894225fe5af4 Mon Sep 17 00:00:00 2001 From: Luk Date: Wed, 11 Dec 2024 12:59:34 +0800 Subject: [PATCH] u --- wopy_tool.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wopy_tool.py b/wopy_tool.py index d11e309..e55c095 100644 --- a/wopy_tool.py +++ b/wopy_tool.py @@ -20,8 +20,10 @@ def load_envar(): lanip = s.getsockname()[0] s.close() # Load environment variables - envFileLocal = os.path.dirname(os.path.abspath(__file__)) + "/envar." + ostype + lanip.split(".")[-1] + ".py" # 本主机配置文件 - envFileDefault = os.path.dirname(os.path.abspath(__file__)) + "/envar.py" # 默认配置文件 + this_script_dir = os.path.dirname(os.path.abspath(__file__)) + calling_script_dir = os.path.dirname(os.path.abspath(sys.argv[0])) # Get the directory of the calling script + envFileLocal = os.path.join(calling_script_dir, "envar." + ostype + lanip.split(".")[-1] + ".py") # 本主机配置文件 + envFileDefault = os.path.join(calling_script_dir, "envar.py") # 默认配置文件 # 总是加载默认配置文件,作为基础配置 print(f"*** Loading default envar file: {envFileDefault}") if not os.path.exists(envFileDefault):