diff --git a/Makefile b/Makefile index c900032..a402220 100644 --- a/Makefile +++ b/Makefile @@ -34,6 +34,7 @@ build: cp -rv "wine install" deb/opt/apps/deepin-wine-runner cp -rv 窗体透明度设置工具.exe deb/opt/apps/deepin-wine-runner cp -rv dlls deb/opt/apps/deepin-wine-runner + cp -rv UpdateGeek.sh deb/opt/apps/deepin-wine-runner dpkg -b deb spark-deepin-wine-runner.deb install: diff --git a/UpdateGeek.sh b/UpdateGeek.sh new file mode 100755 index 0000000..f7ac2f2 --- /dev/null +++ b/UpdateGeek.sh @@ -0,0 +1,14 @@ +cd /tmp +echo 提示: +echo Geek Uninstaller 官网访问较慢,所以请耐心等待 +aria2c -x 16 -s 16 https://geekuninstaller.com/geek.zip +unzip geek.zip +cd `dirname $0` +cp -rv /tmp/geek.exe ./ +if [[ $? == 0]];then + echo "完成" + read + exit +fi +echo "拷贝失败,申请使用 sudo 拷贝" +sudo cp -rv /tmp/geek.exe ./ \ No newline at end of file diff --git a/mainwindow.py b/mainwindow.py index f447905..87a1a9a 100755 --- a/mainwindow.py +++ b/mainwindow.py @@ -1139,6 +1139,7 @@ w4 = QtWidgets.QAction("删除选择的 Wine 容器") w5 = QtWidgets.QAction("打包 wine 应用") w6 = QtWidgets.QAction("使用官方 Wine 适配活动的脚本进行打包") w7 = QtWidgets.QAction("从镜像获取DLL(只支持Windows XP、Windows Server 2003官方安装镜像)") +updateGeek = QtWidgets.QAction("从 Geek Uninstaller 官网升级程序") wineOption.addAction(w1) wineOption.addAction(w2) wineOption.addAction(w3) @@ -1148,6 +1149,9 @@ wineOption.addAction(w5) wineOption.addAction(w6) wineOption.addSeparator() wineOption.addAction(w7) +wineOption.addSeparator() +wineOption.addAction(updateGeek) +wineOption.addSeparator() wm1 = wineOption.addMenu("在指定 Wine、容器安装组件") wm1_1 = QtWidgets.QAction("在指定wine、指定容器安装 .net framework") wm1_2 = QtWidgets.QAction("在指定wine、指定容器安装 Visual Studio C++") @@ -1202,6 +1206,7 @@ w4.triggered.connect(DeleteWineBotton) w5.triggered.connect(BuildExeDeb) w6.triggered.connect(UOSPackageScript) w7.triggered.connect(GetDllFromWindowsISO.ShowWindow) +updateGeek.triggered.connect(lambda: os.system(f"'{programPath}/launch.sh' deepin-terminal -C '\"{programPath}/UpdateGeek.sh\"' --keep-open")) w8.triggered.connect(SetDeepinFileDialogDeepin) w9.triggered.connect(SetDeepinFileDialogDefult) w10.triggered.connect(SetDeepinFileDialogRecovery)