From e3d944e44845feff55a27be9b61ebceb42c2a22d Mon Sep 17 00:00:00 2001 From: gfdgd_xi <3025613752@qq.com> Date: Sun, 23 Oct 2022 21:26:47 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=BB6=E3=80=81=E4=BF=AE=E5=A4=8D=E4=BA=86?= =?UTF-8?q?=E5=AE=B9=E5=99=A8=E8=87=AA=E5=8A=A8=E9=85=8D=E7=BD=AE=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=20GUI=20=E8=A7=A3=E6=9E=90=E5=99=A8=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=20Wine=E3=80=81=E5=AE=B9=E5=99=A8=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E4=BD=8D=E6=95=B0=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AutoConfig.py | 2 +- AutoShell/command/bat | 3 ++- AutoShell/command/changeversion | 3 ++- AutoShell/command/createbotton | 3 ++- AutoShell/command/demo.py | 6 ++++++ AutoShell/command/disbledWinebottlecreatelink | 3 ++- AutoShell/command/disbledhttpproxy | 3 ++- AutoShell/command/disbledopengl | 3 ++- AutoShell/command/disbledwinecrashdialog | 3 ++- AutoShell/command/download | 3 ++- AutoShell/command/enabledWinebottlecreatelink | 3 ++- AutoShell/command/enabledhttpproxy | 3 ++- AutoShell/command/enabledopengl | 3 ++- AutoShell/command/enabledwinecrashdialog | 3 ++- AutoShell/command/error | 3 ++- AutoShell/command/info | 3 ++- AutoShell/command/installdll | 3 ++- AutoShell/command/installdxvk | 3 ++- AutoShell/command/installfont | 3 ++- AutoShell/command/installgecko | 3 ++- AutoShell/command/installmono | 3 ++- AutoShell/command/installmsxml | 3 ++- AutoShell/command/installnet | 3 ++- AutoShell/command/installsparkcorefont | 3 ++- AutoShell/command/installvb | 3 ++- AutoShell/command/installvcpp | 2 ++ AutoShell/command/killallwineserver | 3 ++- AutoShell/command/pause | 3 ++- AutoShell/command/reg | 3 ++- AutoShell/command/stopdll | 3 ++- AutoShell/command/taskmgr | 3 ++- AutoShell/command/thank | 3 ++- AutoShell/command/version | 3 ++- AutoShell/command/warning | 3 ++- AutoShell/command/winecfg | 3 ++- AutoShell/command/winver | 3 ++- ConfigLanguareRunner.py | 13 +++++++------ .../ConfigLanguareRunner.cpython-37.pyc | Bin 17259 -> 17342 bytes mainwindow.py | 14 ++++++++++++-- 39 files changed, 94 insertions(+), 42 deletions(-) create mode 100644 AutoShell/command/demo.py diff --git a/AutoConfig.py b/AutoConfig.py index 3927109..a908704 100755 --- a/AutoConfig.py +++ b/AutoConfig.py @@ -89,7 +89,7 @@ class Connect: if "($" in things: OpenTerminal(f"env WINE='{wine}' WINEPREFIX='{wineprefix}' '{programPath}/ConfigLanguareRunner.py' '{path[0]}' --system") # 执行脚本 - OpenTerminal(f"env WINE='{wine}' WINEPREFIX='{wineprefix}' '{programPath}/AutoShell/main.py' '{path[0]}'") + OpenTerminal(f"env WINEARCH='{os.getenv('WINEARCH')}' WINEDEBUG='{os.getenv('WINEDEBUG')}' WINE='{wine}' WINEPREFIX='{wineprefix}' '{programPath}/AutoShell/main.py' '{path[0]}'") #process = QtCore.QProcess() #process.start(f"{programPath}/launch.sh", ["deepin-terminal", "-e", "env", f"WINE={wine}", f"WINEPREFIX={wineprefix}", f"{programPath}/ConfigLanguareRunner.py", path[0], "--system"]) #process.waitForFinished() diff --git a/AutoShell/command/bat b/AutoShell/command/bat index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/bat +++ b/AutoShell/command/bat @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/changeversion b/AutoShell/command/changeversion index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/changeversion +++ b/AutoShell/command/changeversion @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/createbotton b/AutoShell/command/createbotton index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/createbotton +++ b/AutoShell/command/createbotton @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/demo.py b/AutoShell/command/demo.py new file mode 100644 index 0000000..c1b2416 --- /dev/null +++ b/AutoShell/command/demo.py @@ -0,0 +1,6 @@ +import os +for i in os.listdir(): + with open(i, "r") as file: + things = file.read().replace("sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))", "sys.exit(int(ConfigLanguareRunner.programEnv[9][1]))") + with open(i, "w") as file: + file.write(things) \ No newline at end of file diff --git a/AutoShell/command/disbledWinebottlecreatelink b/AutoShell/command/disbledWinebottlecreatelink index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/disbledWinebottlecreatelink +++ b/AutoShell/command/disbledWinebottlecreatelink @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/disbledhttpproxy b/AutoShell/command/disbledhttpproxy index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/disbledhttpproxy +++ b/AutoShell/command/disbledhttpproxy @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/disbledopengl b/AutoShell/command/disbledopengl index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/disbledopengl +++ b/AutoShell/command/disbledopengl @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/disbledwinecrashdialog b/AutoShell/command/disbledwinecrashdialog index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/disbledwinecrashdialog +++ b/AutoShell/command/disbledwinecrashdialog @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/download b/AutoShell/command/download index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/download +++ b/AutoShell/command/download @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/enabledWinebottlecreatelink b/AutoShell/command/enabledWinebottlecreatelink index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/enabledWinebottlecreatelink +++ b/AutoShell/command/enabledWinebottlecreatelink @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/enabledhttpproxy b/AutoShell/command/enabledhttpproxy index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/enabledhttpproxy +++ b/AutoShell/command/enabledhttpproxy @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/enabledopengl b/AutoShell/command/enabledopengl index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/enabledopengl +++ b/AutoShell/command/enabledopengl @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/enabledwinecrashdialog b/AutoShell/command/enabledwinecrashdialog index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/enabledwinecrashdialog +++ b/AutoShell/command/enabledwinecrashdialog @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/error b/AutoShell/command/error index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/error +++ b/AutoShell/command/error @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/info b/AutoShell/command/info index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/info +++ b/AutoShell/command/info @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/installdll b/AutoShell/command/installdll index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/installdll +++ b/AutoShell/command/installdll @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/installdxvk b/AutoShell/command/installdxvk index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/installdxvk +++ b/AutoShell/command/installdxvk @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/installfont b/AutoShell/command/installfont index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/installfont +++ b/AutoShell/command/installfont @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/installgecko b/AutoShell/command/installgecko index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/installgecko +++ b/AutoShell/command/installgecko @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/installmono b/AutoShell/command/installmono index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/installmono +++ b/AutoShell/command/installmono @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/installmsxml b/AutoShell/command/installmsxml index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/installmsxml +++ b/AutoShell/command/installmsxml @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/installnet b/AutoShell/command/installnet index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/installnet +++ b/AutoShell/command/installnet @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/installsparkcorefont b/AutoShell/command/installsparkcorefont index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/installsparkcorefont +++ b/AutoShell/command/installsparkcorefont @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/installvb b/AutoShell/command/installvb index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/installvb +++ b/AutoShell/command/installvb @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/installvcpp b/AutoShell/command/installvcpp index bcf4bde..331d1ca 100755 --- a/AutoShell/command/installvcpp +++ b/AutoShell/command/installvcpp @@ -11,3 +11,5 @@ for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) + +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/killallwineserver b/AutoShell/command/killallwineserver index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/killallwineserver +++ b/AutoShell/command/killallwineserver @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/pause b/AutoShell/command/pause index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/pause +++ b/AutoShell/command/pause @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/reg b/AutoShell/command/reg index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/reg +++ b/AutoShell/command/reg @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/stopdll b/AutoShell/command/stopdll index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/stopdll +++ b/AutoShell/command/stopdll @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/taskmgr b/AutoShell/command/taskmgr index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/taskmgr +++ b/AutoShell/command/taskmgr @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/thank b/AutoShell/command/thank index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/thank +++ b/AutoShell/command/thank @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/version b/AutoShell/command/version index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/version +++ b/AutoShell/command/version @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/warning b/AutoShell/command/warning index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/warning +++ b/AutoShell/command/warning @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/winecfg b/AutoShell/command/winecfg index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/winecfg +++ b/AutoShell/command/winecfg @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/AutoShell/command/winver b/AutoShell/command/winver index 1bf2fba..b766ea2 100755 --- a/AutoShell/command/winver +++ b/AutoShell/command/winver @@ -10,4 +10,5 @@ argv = [] for i in sys.argv[1:]: argv.append(i.replace(" ", "\\ ")) com = ConfigLanguareRunner.Command(f"{os.path.basename(sys.argv[0])} {' '.join(argv)}") -com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) \ No newline at end of file +com.Run(com.GetCommandList(), os.getenv("WINEPREFIX"), os.getenv("WINE")) +sys.exit(int(ConfigLanguareRunner.programEnv[9][1])) \ No newline at end of file diff --git a/ConfigLanguareRunner.py b/ConfigLanguareRunner.py index ba6c723..b966e9d 100755 --- a/ConfigLanguareRunner.py +++ b/ConfigLanguareRunner.py @@ -553,6 +553,10 @@ class Command(): break app = QtWidgets.QApplication(sys.argv) +if os.getenv("WINE") != None: + programEnv[1][1] = os.getenv("WINE") +if os.getenv("WINEPREFIX") != None: + programEnv[0][1] = os.getenv("WINEPREFIX") if __name__ == "__main__": optionAll = 0 if "--debug" in sys.argv: @@ -560,10 +564,6 @@ if __name__ == "__main__": if "--system" in sys.argv: programEnv[2][1] = "1" optionAll += 1 - if os.getenv("WINE") != None: - programEnv[1][1] = os.getenv("WINE") - if os.getenv("WINEPREFIX") != None: - programEnv[0][1] = os.getenv("WINEPREFIX") if len(sys.argv) - optionAll < 2: print("Wine 运行器自动配置文件解析器交互环境") print(f"版本：{version}") @@ -575,7 +575,7 @@ if __name__ == "__main__": break com = Command(commandLine) com.Run(com.GetCommandList(), programEnv[0][1], programEnv[1][1]) - exit() + sys.exit(int(programEnv[9][1])) # 读取文件 try: file = open(sys.argv[1], "r") @@ -588,4 +588,5 @@ if __name__ == "__main__": print(f"版本：{version}") print(f"©2020~{time.strftime('%Y')} gfdgd xi、为什么您不喜欢熊出没和阿布呢") print("--------------------------------------------------------------") - com.Run(com.GetCommandList(), programEnv[0][1], programEnv[1][1]) \ No newline at end of file + com.Run(com.GetCommandList(), programEnv[0][1], programEnv[1][1]) + sys.exit(int(programEnv[9][1])) \ No newline at end of file diff --git a/__pycache__/ConfigLanguareRunner.cpython-37.pyc b/__pycache__/ConfigLanguareRunner.cpython-37.pyc index 691b9ff2c301a792fcadd9319f7ba6f417443822..1b58d76a9a0bed763570eb80f04ad3d921057e6e 100644 GIT binary patch delta 793 zcma)4O>YuW6n%GwAQEZNC}A{O#17?az^}%{G*OUNy08)&g`$yE-nG(!L8oABH!Mih zg$tTlHZ?O_R~q-GiCcdG|G@YUy7Iosl$9|~=H7STxo6It`|^IjgYWMlR1AfJjGoDz zM=gCXq`>2^^II@v_AH-sfP*fN!Tf;U9-~}U7*`jWizKFu&&PXWFpm*)v3UnZ01Pkl zq%MtRv&vZ`&Ql0m7j-{rPcY8aTLMc@v7;dmlTgMJ@(6fE5JrIUDB~HOjV1FF#(371 zk8ur8@3RBR+eJ~bBV2J{pYihtvWMox`nH5~JU@bliYmWKrX;goVR!*m!V;LU=W&>@ zlMXwcMG=)dx56A5=*O>1HHKiPFio9n!luGT;E?!E5;MZ4%fCL78d(y~+L}Xs63^N> zhXJcG;}XzH=Mv*LTyvzxRiUuX3~5*wjhmk9|DMeC{!iEv6zZg<1r`CN`(>!I)5w~(*0Sn}0YR+r3WafO1StW=klSL%&` zs0-D5B~>~6G;W^?z1rg3~e*xU_h+V;+NAG>Cmz8fr9&k9-V$K4j(x8j91{6Z>eqF{{KezffwN?7ix@dq$ztF&|iZF%3_xz2a@Kt)Imw>uDEXK#A+5Ae;lDTo6z^S*CBJKygzUti*{7nmp~5^_$5%Ux_R?uj}6AY3~Cc6e*rh12^ZP ze=eXq%B=u7x(0psy|0NhPe@G^PKnAn*sT*g2z^Lvf1NI|0d)qRb>|q z%BU8MRqNDy8)__x)aoVlNP4BZEap!Nu8jbA-8(yQaf5x`Cc=%*p zF4N2H$83AAz1I@k@;1p{q*l4N)QjuYsV*&7R#b1{NbQsaPOBfKZzJ*}QT2i5PHUs- zmA1Be(RI-h-cxy(`m(CNlnd%-c@E#H%;H)yjuAYIF`9ZE#0z?=*Na1`C}ULXel$FZ J;W@lS)nAj`l4Ae> diff --git a/mainwindow.py b/mainwindow.py index fc90a50..f722f86 100755 --- a/mainwindow.py +++ b/mainwindow.py @@ -616,7 +616,16 @@ def WineBottonAutoConfig(): wineBottonPath = setting["DefultBotton"] else: wineBottonPath = e1.currentText() - os.system(f"'{programPath}/AutoConfig.py' '{wine[o1.currentText()]}' '{wineBottonPath}'") + option = "" + if setting["Architecture"] != "Auto": + option += f"WINEARCH={setting['Architecture']} " + if setting["MonoGeckoInstaller"]: + option += f"WINEDLLOVERRIDES=\"mscoree,mshtml=\" " + if not setting["Debug"]: + option += "WINEDEBUG=-all " + else: + option += "WINEDEBUG=FIXME,ERR,WARN,TRACE,Message " + os.system(f"env WINEPREFIX='{wineBottonPath}' {option} WINE='{wine[o1.currentText()]}' '{programPath}/AutoConfig.py' '{wine[o1.currentText()]}' '{wineBottonPath}'") def InstallMonoGecko(program): if e1.currentText() == "": @@ -1840,10 +1849,11 @@ updateThingsString = '''※1、新增 VB Runtime 组件安装工具 ※3、新增 Wine 容器快捷键映射功能 ※4、修复在 arm 架构运行 Wine 时提示无法解压资源的问题 ※5、修复右键无法找到 Wine 运行器打开方式的问题 +※6、修复了容器自动配置脚本 GUI 解析器无法指定 Wine、容器以及位数的功能 ''' for i in information["Thank"]: thankText += f"{i}\n" -updateTime = "2022年10月22日" +updateTime = "2022年10月23日" about = f'''

关于

一个能让Linux用户更加方便运行Windows应用的程序，内置了对wine图形化的支持和各种Wine工具和自制Wine程序打包器、运行库安装工具等等

同时也内置了基于VirtualBox制作的小白Windows虚拟机安装工具，可以做到只需要用户下载系统镜像并点击安装即可，无需顾及虚拟机安装、创建、虚拟机的分区等等