From 70014b29efa52d9d661c0e4192010b1dde4b3207 Mon Sep 17 00:00:00 2001 From: gfdgd_xi <3025613752@qq.com> Date: Tue, 11 Jul 2023 10:23:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=90=E8=A1=8C=E5=BA=93?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WineLib/install.sh | 1 + WineLib/remove.sh | 1 + information.json | 2 +- mainwindow.py | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/WineLib/install.sh b/WineLib/install.sh index f9606d9..07e37bf 100755 --- a/WineLib/install.sh +++ b/WineLib/install.sh @@ -3,6 +3,7 @@ CURRENT_DIR=$(cd $(dirname $0); pwd) cd $CURRENT_DIR if [[ -f $CURRENT_DIR/usr/lib/ld-linux-x86-64.so.2 ]]; then echo 运行库已安装,按回车键退出 + read exit fi aria2c -x 16 -s 16 -d /tmp https://jihulab.com/gfdgd-xi/bwrapruntime/-/raw/main/library.tar.xz diff --git a/WineLib/remove.sh b/WineLib/remove.sh index edfc1e6..2e7d2bb 100755 --- a/WineLib/remove.sh +++ b/WineLib/remove.sh @@ -3,6 +3,7 @@ CURRENT_DIR=$(cd $(dirname $0); pwd) cd $CURRENT_DIR if [[ ! -f $CURRENT_DIR/usr/lib/ld-linux-x86-64.so.2 ]]; then echo 运行库未安装,按回车键退出 + read exit fi sudo rm -rfv lib diff --git a/information.json b/information.json index 761e71d..95f5f45 100644 --- a/information.json +++ b/information.json @@ -1,5 +1,5 @@ { - "Version": "3.2.2", + "Version": "3.3.0", "Time": "未知", "Thank": [ "感谢 RacoonGX 的付出与贡献", diff --git a/mainwindow.py b/mainwindow.py index 2805ac2..1d9f1d9 100755 --- a/mainwindow.py +++ b/mainwindow.py @@ -3015,7 +3015,7 @@ installLib.addAction(statusRunnerLib) installLib.addAction(installRunnerLib) installLib.addAction(removeRunnerLib) installRunnerLib.triggered.connect(lambda: threading.Thread(target=OpenTerminal, args=[f"bash '{programPath}/WineLib/install.sh'"]).start()) -removeRunnerLib.triggered.connect(lambda: threading.Thread(target=OpenTerminal, args=[f"bash '{programPath}/WineLib/install.sh'"]).start()) +removeRunnerLib.triggered.connect(lambda: threading.Thread(target=OpenTerminal, args=[f"bash '{programPath}/WineLib/remove.sh'"]).start()) if os.path.exists(f"{programPath}/WineLib/usr/lib/ld-linux-x86-64.so.2"): installRunnerLib.setDisabled(True) removeRunnerLib.setEnabled(True)