diff --git a/AutoConfig.py b/AutoConfig.py index 2f4c949..258d5a1 100755 --- a/AutoConfig.py +++ b/AutoConfig.py @@ -350,7 +350,6 @@ class ProgramRunStatusShow(): print(f"脚本:{name}") print(f"评论:{info}") try: - # res = requests.post(base64.b64decode("aHR0cDovLzEyMC4yNS4xNTMuMTQ0OjMwMjUwL1BpbmdMdW4=").decode("utf-8"), {"PinLun": info, "Version": name}).json() print(res) if res["ExitCode"]: diff --git a/Makefile b/Makefile index 3a797d7..0b05c3f 100755 --- a/Makefile +++ b/Makefile @@ -93,6 +93,25 @@ build: cp -rv API deb/opt/apps/deepin-wine-runner cp -rv key deb/opt/apps/deepin-wine-runner python3 RemovePycacheFile.py + ln -s /opt/apps/deepin-wine-runner/deepin-wine-packager.py /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-package-builder + ln -s /opt/apps/deepin-wine-runner/deepin-wine-easy-packager.py /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-packager-easy-builder + ln -s /opt/apps/deepin-wine-runner/deepin-wine-packager-with-script.py /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-packager-with-script + ln -s /opt/apps/deepin-wine-runner/deepin-wine-runner /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-runner + ln -s /opt/apps/deepin-wine-runner/AppStore.py /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-runner-appstore + ln -s /opt/apps/deepin-wine-runner/AutoShell/main.py /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-runner-auto-install-bash + ln -s /opt/apps/deepin-wine-runner/ConfigLanguareRunner.py /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-runner-auto-install-config-old + ln -s /opt/apps/deepin-wine-runner/AutoConfig.py /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-runner-auto-install-gui + ln -s /opt/apps/deepin-wine-runner/launch.sh /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-runner-dtk-launch + ln -s /opt/apps/deepin-wine-runner/deepin-wine-runner-update-bug /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-runner-update-bug + ln -s /opt/apps/deepin-wine-runner/InstallFont.py /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-runner-wine-font-installer + ln -s /opt/apps/deepin-wine-runner/InstallNewWineHQ.sh /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-runner-winehq-install + ln -s '/opt/apps/deepin-wine-runner/wine install' /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-runner-wine-install + ln -s '/opt/apps/deepin-wine-runner/wine install' /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-runner-wine-installer + ln -s /opt/apps/deepin-wine-runner/InstallWineOnDeepin23.py /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-runner-wine-install-deepin23 + ln -s /opt/apps/deepin-wine-runner/InstallMono.py /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-runner-wine-monogecko-installer + ln -s /opt/apps/deepin-wine-runner/InstallNetFramework.py /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-runner-wine-netframework-installer + ln -s /opt/apps/deepin-wine-runner/InstallVisualCPlusPlus.py /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-runner-wine-vscppruntime-installer + ln -s /opt/apps/deepin-wine-runner/deepin-wine-venturi-setter.py /tmp/spark-deepin-wine-runner-builder/usr/bin/deepin-wine-venturi-setter cp -rv deb /tmp/spark-deepin-wine-runner-builder sudo chown -R root:root /tmp/spark-deepin-wine-runner-builder diff --git a/__pycache__/ConfigLanguareRunner.cpython-37.pyc b/__pycache__/ConfigLanguareRunner.cpython-37.pyc index 61e583b..d6e29bb 100644 Binary files a/__pycache__/ConfigLanguareRunner.cpython-37.pyc and b/__pycache__/ConfigLanguareRunner.cpython-37.pyc differ diff --git a/deb/usr/bin/deepin-wine-package-builder b/deb/usr/bin/deepin-wine-package-builder deleted file mode 120000 index 86e9a2d..0000000 --- a/deb/usr/bin/deepin-wine-package-builder +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/deepin-wine-packager.py \ No newline at end of file diff --git a/deb/usr/bin/deepin-wine-packager-easy-builder b/deb/usr/bin/deepin-wine-packager-easy-builder deleted file mode 120000 index a3966ad..0000000 --- a/deb/usr/bin/deepin-wine-packager-easy-builder +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/deepin-wine-easy-packager.py \ No newline at end of file diff --git a/deb/usr/bin/deepin-wine-packager-with-script b/deb/usr/bin/deepin-wine-packager-with-script deleted file mode 120000 index 26c2214..0000000 --- a/deb/usr/bin/deepin-wine-packager-with-script +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/deepin-wine-packager-with-script.py \ No newline at end of file diff --git a/deb/usr/bin/deepin-wine-runner b/deb/usr/bin/deepin-wine-runner deleted file mode 120000 index 73ed0c1..0000000 --- a/deb/usr/bin/deepin-wine-runner +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/deepin-wine-runner \ No newline at end of file diff --git a/deb/usr/bin/deepin-wine-runner-appstore b/deb/usr/bin/deepin-wine-runner-appstore deleted file mode 120000 index d0c08d3..0000000 --- a/deb/usr/bin/deepin-wine-runner-appstore +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/AppStore.py \ No newline at end of file diff --git a/deb/usr/bin/deepin-wine-runner-auto-install-bash b/deb/usr/bin/deepin-wine-runner-auto-install-bash deleted file mode 120000 index f2b2a30..0000000 --- a/deb/usr/bin/deepin-wine-runner-auto-install-bash +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/AutoShell/main.py \ No newline at end of file diff --git a/deb/usr/bin/deepin-wine-runner-auto-install-config-old b/deb/usr/bin/deepin-wine-runner-auto-install-config-old deleted file mode 120000 index 3e3f67e..0000000 --- a/deb/usr/bin/deepin-wine-runner-auto-install-config-old +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/ConfigLanguareRunner.py \ No newline at end of file diff --git a/deb/usr/bin/deepin-wine-runner-auto-install-gui b/deb/usr/bin/deepin-wine-runner-auto-install-gui deleted file mode 120000 index f886374..0000000 --- a/deb/usr/bin/deepin-wine-runner-auto-install-gui +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/AutoConfig.py \ No newline at end of file diff --git a/deb/usr/bin/deepin-wine-runner-dtk-launch b/deb/usr/bin/deepin-wine-runner-dtk-launch deleted file mode 120000 index 2d19477..0000000 --- a/deb/usr/bin/deepin-wine-runner-dtk-launch +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/launch.sh \ No newline at end of file diff --git a/deb/usr/bin/deepin-wine-runner-update-bug b/deb/usr/bin/deepin-wine-runner-update-bug deleted file mode 120000 index facbe13..0000000 --- a/deb/usr/bin/deepin-wine-runner-update-bug +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/deepin-wine-runner-update-bug \ No newline at end of file diff --git a/deb/usr/bin/deepin-wine-runner-wine-font-installer b/deb/usr/bin/deepin-wine-runner-wine-font-installer deleted file mode 120000 index 696be11..0000000 --- a/deb/usr/bin/deepin-wine-runner-wine-font-installer +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/InstallFont.py \ No newline at end of file diff --git a/deb/usr/bin/deepin-wine-runner-wine-install b/deb/usr/bin/deepin-wine-runner-wine-install deleted file mode 120000 index 43deece..0000000 --- a/deb/usr/bin/deepin-wine-runner-wine-install +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/wine install \ No newline at end of file diff --git a/deb/usr/bin/deepin-wine-runner-wine-install-deepin23 b/deb/usr/bin/deepin-wine-runner-wine-install-deepin23 deleted file mode 120000 index 67fc0f2..0000000 --- a/deb/usr/bin/deepin-wine-runner-wine-install-deepin23 +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/InstallWineOnDeepin23.py \ No newline at end of file diff --git a/deb/usr/bin/deepin-wine-runner-wine-installer b/deb/usr/bin/deepin-wine-runner-wine-installer deleted file mode 120000 index 43deece..0000000 --- a/deb/usr/bin/deepin-wine-runner-wine-installer +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/wine install \ No newline at end of file diff --git a/deb/usr/bin/deepin-wine-runner-wine-monogecko-installer b/deb/usr/bin/deepin-wine-runner-wine-monogecko-installer deleted file mode 120000 index 568aac9..0000000 --- a/deb/usr/bin/deepin-wine-runner-wine-monogecko-installer +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/InstallMono.py \ No newline at end of file diff --git a/deb/usr/bin/deepin-wine-runner-wine-netframework-installer b/deb/usr/bin/deepin-wine-runner-wine-netframework-installer deleted file mode 120000 index dd9b7e9..0000000 --- a/deb/usr/bin/deepin-wine-runner-wine-netframework-installer +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/InstallNetFramework.py \ No newline at end of file diff --git a/deb/usr/bin/deepin-wine-runner-wine-vscppruntime-installer b/deb/usr/bin/deepin-wine-runner-wine-vscppruntime-installer deleted file mode 120000 index ec2afc4..0000000 --- a/deb/usr/bin/deepin-wine-runner-wine-vscppruntime-installer +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/InstallVisualCPlusPlus.py \ No newline at end of file diff --git a/deb/usr/bin/deepin-wine-runner-winehq-install b/deb/usr/bin/deepin-wine-runner-winehq-install deleted file mode 120000 index 5967df2..0000000 --- a/deb/usr/bin/deepin-wine-runner-winehq-install +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/InstallNewWineHQ.sh \ No newline at end of file diff --git a/deb/usr/bin/deepin-wine-venturi-setter b/deb/usr/bin/deepin-wine-venturi-setter deleted file mode 120000 index 154ba74..0000000 --- a/deb/usr/bin/deepin-wine-venturi-setter +++ /dev/null @@ -1 +0,0 @@ -/opt/apps/deepin-wine-runner/deepin-wine-venturi-setter.py \ No newline at end of file diff --git a/mainwindow.py b/mainwindow.py index 6200bfb..77fac0f 100755 --- a/mainwindow.py +++ b/mainwindow.py @@ -2218,6 +2218,10 @@ try: isoPathFound = list(json.loads(readtxt(get_home() + "/.config/deepin-wine-runner/ISOPathFound.json")).values()) setting = json.loads(readtxt(get_home() + "/.config/deepin-wine-runner/WineSetting.json")) change = False + if not os.path.exists(get_home() + "/.config/deepin-wine-runner/mono-lock"): + os.mknod(f"{get_home()}/.config/deepin-wine-runner/mono-lock") + setting["MonoGeckoInstaller"] = False + change = True for i in defultProgramList.keys(): if not i in setting: change = True diff --git a/uengineapi/__pycache__/__init__.cpython-37.pyc b/uengineapi/__pycache__/__init__.cpython-37.pyc index 19e78e5..eafbd68 100644 Binary files a/uengineapi/__pycache__/__init__.cpython-37.pyc and b/uengineapi/__pycache__/__init__.cpython-37.pyc differ