From e120db0bee41e2a65469f348e09b1255f9d0f89f Mon Sep 17 00:00:00 2001
From: gfdgd_xi <3025613752@qq.com>
Date: Sun, 25 Sep 2022 12:30:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=98=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 InstallNewWineHQ.sh                              | 16 ++++++++--------
 .../apps/deepin-wine-runner/InstallNewWineHQ.sh  | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/InstallNewWineHQ.sh b/InstallNewWineHQ.sh
index d006714..4ddcbfd 100755
--- a/InstallNewWineHQ.sh
+++ b/InstallNewWineHQ.sh
@@ -20,14 +20,14 @@ echo '                                        # '
                                           
 
 ubuntuSource=(
-    "echo \"deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/ubuntu/ jammy main\" | sudo tee /etc/apt/sources.list.d/winehq.list | cat > /dev/null"
+    "echo deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/ubuntu/ jammy main | sudo tee /etc/apt/sources.list.d/winehq.list"
     "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/impish/winehq-impish.sources" 
-    "echo \"deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/ubuntu/ focal main\" | sudo tee /etc/apt/sources.list.d/winehq.list | cat > /dev/null"
-    "echo \"deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/ubuntu/ bionic main\" | sudo tee /etc/apt/sources.list.d/winehq.list | cat > /dev/null"
+    "echo deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/ubuntu/ focal main | sudo tee /etc/apt/sources.list.d/winehq.list"
+    "echo deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/ubuntu/ bionic main | sudo tee /etc/apt/sources.list.d/winehq.list"
 )
 debianSource=(
-    "echo \"deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/debian/ buster main\" | sudo tee /etc/apt/sources.list.d/winehq.list | cat > /dev/null"
-    "echo \"deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/debian/ bullseye main\" | sudo tee /etc/apt/sources.list.d/winehq.list | cat > /dev/null"
+    "echo deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/debian/ buster main | sudo tee /etc/apt/sources.list.d/winehq.list"
+    "echo deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/debian/ bullseye main | sudo tee /etc/apt/sources.list.d/winehq.list"
     "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources"
 )
 # 选择发行版
@@ -78,13 +78,13 @@ if [ $? == 0 ]; then
 fi
 # 添加源
 if [ $system = "0" ]; then
-    ${debianSource[$systemVersion]}
+    bash -c "${debianSource[$systemVersion]}"
 fi
 if [ $system = "1" ]; then
-    ${ubuntuSource[$systemVersion]}
+    bash -c "${ubuntuSource[$systemVersion]}"
 fi
 sudo $apt update
-# 安装 Wine
+# 安装 Wine 
 wineInstall=("sudo $apt install --install-recommends winehq-stable" "sudo $apt install --install-recommends winehq-devel" "sudo $apt install --install-recommends winehq-staging")
 ${wineInstall[$programVersion]}
 echo "按回车键退出"
diff --git a/deb/opt/apps/deepin-wine-runner/InstallNewWineHQ.sh b/deb/opt/apps/deepin-wine-runner/InstallNewWineHQ.sh
index d006714..4ddcbfd 100755
--- a/deb/opt/apps/deepin-wine-runner/InstallNewWineHQ.sh
+++ b/deb/opt/apps/deepin-wine-runner/InstallNewWineHQ.sh
@@ -20,14 +20,14 @@ echo '                                        # '
                                           
 
 ubuntuSource=(
-    "echo \"deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/ubuntu/ jammy main\" | sudo tee /etc/apt/sources.list.d/winehq.list | cat > /dev/null"
+    "echo deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/ubuntu/ jammy main | sudo tee /etc/apt/sources.list.d/winehq.list"
     "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/impish/winehq-impish.sources" 
-    "echo \"deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/ubuntu/ focal main\" | sudo tee /etc/apt/sources.list.d/winehq.list | cat > /dev/null"
-    "echo \"deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/ubuntu/ bionic main\" | sudo tee /etc/apt/sources.list.d/winehq.list | cat > /dev/null"
+    "echo deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/ubuntu/ focal main | sudo tee /etc/apt/sources.list.d/winehq.list"
+    "echo deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/ubuntu/ bionic main | sudo tee /etc/apt/sources.list.d/winehq.list"
 )
 debianSource=(
-    "echo \"deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/debian/ buster main\" | sudo tee /etc/apt/sources.list.d/winehq.list | cat > /dev/null"
-    "echo \"deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/debian/ bullseye main\" | sudo tee /etc/apt/sources.list.d/winehq.list | cat > /dev/null"
+    "echo deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/debian/ buster main | sudo tee /etc/apt/sources.list.d/winehq.list"
+    "echo deb [arch=amd64,i386 signed-by=/usr/share/keyrings/winehq-archive.key] https://mirrors.tuna.tsinghua.edu.cn/wine-builds/debian/ bullseye main | sudo tee /etc/apt/sources.list.d/winehq.list"
     "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources"
 )
 # 选择发行版
@@ -78,13 +78,13 @@ if [ $? == 0 ]; then
 fi
 # 添加源
 if [ $system = "0" ]; then
-    ${debianSource[$systemVersion]}
+    bash -c "${debianSource[$systemVersion]}"
 fi
 if [ $system = "1" ]; then
-    ${ubuntuSource[$systemVersion]}
+    bash -c "${ubuntuSource[$systemVersion]}"
 fi
 sudo $apt update
-# 安装 Wine
+# 安装 Wine 
 wineInstall=("sudo $apt install --install-recommends winehq-stable" "sudo $apt install --install-recommends winehq-devel" "sudo $apt install --install-recommends winehq-staging")
 ${wineInstall[$programVersion]}
 echo "按回车键退出"