From 375cb1147fd7af9d79be07e01f3f40146d24081b Mon Sep 17 00:00:00 2001
From: gfdgd_xi <3025613752@qq.com>
Date: Sun, 25 Sep 2022 10:17:36 +0800
Subject: [PATCH] =?UTF-8?q?WineHQ=E5=AE=89=E8=A3=85=E5=99=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2=E5=9B=BD=E5=86=85=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 InstallNewWineHQ.sh                               | 15 ++++++++-------
 deb/DEBIAN/control                                | 15 ++++++++-------
 .../apps/deepin-wine-runner/InstallNewWineHQ.sh   | 15 ++++++++-------
 .../apps/deepin-wine-runner/deepin-wine-runner    | 13 +++++++------
 mainwindow.py                                     | 13 +++++++------
 5 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/InstallNewWineHQ.sh b/InstallNewWineHQ.sh
index 7c2a986..d006714 100755
--- a/InstallNewWineHQ.sh
+++ b/InstallNewWineHQ.sh
@@ -2,8 +2,8 @@
 # 使用系统默认的 bash 运行
 ###########################################################################################
 # 作者：gfdgd xi、为什么您不喜欢熊出没和阿布呢
-# 版本：2.1.0
-# 更新时间：2022年08月25日
+# 版本：2.2.0
+# 更新时间：2022年09月25日
 # 感谢：感谢 wine 以及 deepin-wine 团队，提供了 wine 和 deepin-wine 给大家使用，让我能做这个程序
 # 基于 Python3 构建
 ###########################################################################################
@@ -20,18 +20,19 @@ echo '                                        # '
                                           
 
 ubuntuSource=(
-    "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/winehq-jammy.sources" 
+    "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"
     "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/impish/winehq-impish.sources" 
-    "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/focal/winehq-focal.sources" 
-    "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/bionic/winehq-bionic.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"
 )
 debianSource=(
-    "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/buster/winehq-buster.sources" 
-    "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bullseye/winehq-bullseye.sources" 
+    "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"
     "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources"
 )
 # 选择发行版
 echo "WineHQ 官网：https://wiki.winehq.org/"
+echo "国内镜像源：https://mirrors-i.tuna.tsinghua.edu.cn/help/wine-builds/"
 echo
 echo "选择发行版："
 echo "0. Debian"
diff --git a/deb/DEBIAN/control b/deb/DEBIAN/control
index eddca1c..3917ba3 100755
--- a/deb/DEBIAN/control
+++ b/deb/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: spark-deepin-wine-runner
-Version: 2.2.0
+Version: 2.2.0-uos
 Maintainer: gfdgd xi <3025613752@qq.com>, 为什么您不喜欢熊出没和阿布呢
 Homepage: https://gitee.com/gfdgd-xi/deep-wine-runner, https://github.com/gfdgd-xi/deep-wine-runner, https://gitlink.org.cn/gfdgd_xi/deep-wine-runner
 Architecture: all
@@ -24,12 +24,13 @@ Description: gfdgd xi、为什么您不喜欢熊出没和阿布呢 制作的 win
  ※10、修复出现星火应用商店和官方应用商店反复提示更新死循环的问题
  ※11、新增评分分数预测功能（不准）
  ※12、更换程序接口
- 13、更新组件安装的离线列表
- 14、不再强制依赖深度终端，只做推荐安装
- 15、基于生态活动适配脚本的打包器在打包完成后会弹出对话框提示打包完成
- 16、优化打包器的 spark wine helper 依赖设置方式
- 17、新增 RegShot（注册表比对工具）
- 18、添加 Wine 运行器评分数据的搜索功能
+ ※13、将 WineHQ 的源换为国内源
+ 14、更新组件安装的离线列表
+ 15、不再强制依赖深度终端，只做推荐安装
+ 16、基于生态活动适配脚本的打包器在打包完成后会弹出对话框提示打包完成
+ 17、优化打包器的 spark wine helper 依赖设置方式
+ 18、新增 RegShot（注册表比对工具）
+ 19、添加 Wine 运行器评分数据的搜索功能
  以下更新内容旧版本也适用（只限 2.1.0 及以上版本）：
  ※1、在“安装更多Wine”的Wine安装工具中上新 Wine
  ※2、云 Dll 工具上新 Dll
diff --git a/deb/opt/apps/deepin-wine-runner/InstallNewWineHQ.sh b/deb/opt/apps/deepin-wine-runner/InstallNewWineHQ.sh
index 7c2a986..d006714 100755
--- a/deb/opt/apps/deepin-wine-runner/InstallNewWineHQ.sh
+++ b/deb/opt/apps/deepin-wine-runner/InstallNewWineHQ.sh
@@ -2,8 +2,8 @@
 # 使用系统默认的 bash 运行
 ###########################################################################################
 # 作者：gfdgd xi、为什么您不喜欢熊出没和阿布呢
-# 版本：2.1.0
-# 更新时间：2022年08月25日
+# 版本：2.2.0
+# 更新时间：2022年09月25日
 # 感谢：感谢 wine 以及 deepin-wine 团队，提供了 wine 和 deepin-wine 给大家使用，让我能做这个程序
 # 基于 Python3 构建
 ###########################################################################################
@@ -20,18 +20,19 @@ echo '                                        # '
                                           
 
 ubuntuSource=(
-    "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/winehq-jammy.sources" 
+    "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"
     "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/impish/winehq-impish.sources" 
-    "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/focal/winehq-focal.sources" 
-    "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/bionic/winehq-bionic.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"
 )
 debianSource=(
-    "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/buster/winehq-buster.sources" 
-    "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bullseye/winehq-bullseye.sources" 
+    "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"
     "sudo wget -nc -P /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources"
 )
 # 选择发行版
 echo "WineHQ 官网：https://wiki.winehq.org/"
+echo "国内镜像源：https://mirrors-i.tuna.tsinghua.edu.cn/help/wine-builds/"
 echo
 echo "选择发行版："
 echo "0. Debian"
diff --git a/deb/opt/apps/deepin-wine-runner/deepin-wine-runner b/deb/opt/apps/deepin-wine-runner/deepin-wine-runner
index f114df5..8f7cf8e 100755
--- a/deb/opt/apps/deepin-wine-runner/deepin-wine-runner
+++ b/deb/opt/apps/deepin-wine-runner/deepin-wine-runner
@@ -1791,12 +1791,13 @@ updateThingsString = '''※1、Dll 提取工具支持 NT 6.X 及以上版本的
 ※10、修复出现星火应用商店和官方应用商店反复提示更新死循环的问题
 ※11、新增评分分数预测功能（不准）
 ※12、更换程序接口
-13、更新组件安装的离线列表
-14、不再强制依赖深度终端，只做推荐安装
-15、基于生态活动适配脚本的打包器在打包完成后会弹出对话框提示打包完成
-16、优化打包器的 spark wine helper 依赖设置方式
-17、新增 RegShot（注册表比对工具）
-18、添加 Wine 运行器评分数据的搜索功能
+※13、将 WineHQ 的源换为国内源
+14、更新组件安装的离线列表
+15、不再强制依赖深度终端，只做推荐安装
+16、基于生态活动适配脚本的打包器在打包完成后会弹出对话框提示打包完成
+17、优化打包器的 spark wine helper 依赖设置方式
+18、新增 RegShot（注册表比对工具）
+19、添加 Wine 运行器评分数据的搜索功能
 <b>以下更新内容旧版本也适用（只限 2.1.0 及以上版本）</b>
 ※1、在“安装更多Wine”的Wine安装工具中上新 Wine
 ※2、云 Dll 工具上新 Dll
diff --git a/mainwindow.py b/mainwindow.py
index f114df5..8f7cf8e 100755
--- a/mainwindow.py
+++ b/mainwindow.py
@@ -1791,12 +1791,13 @@ updateThingsString = '''※1、Dll 提取工具支持 NT 6.X 及以上版本的
 ※10、修复出现星火应用商店和官方应用商店反复提示更新死循环的问题
 ※11、新增评分分数预测功能（不准）
 ※12、更换程序接口
-13、更新组件安装的离线列表
-14、不再强制依赖深度终端，只做推荐安装
-15、基于生态活动适配脚本的打包器在打包完成后会弹出对话框提示打包完成
-16、优化打包器的 spark wine helper 依赖设置方式
-17、新增 RegShot（注册表比对工具）
-18、添加 Wine 运行器评分数据的搜索功能
+※13、将 WineHQ 的源换为国内源
+14、更新组件安装的离线列表
+15、不再强制依赖深度终端，只做推荐安装
+16、基于生态活动适配脚本的打包器在打包完成后会弹出对话框提示打包完成
+17、优化打包器的 spark wine helper 依赖设置方式
+18、新增 RegShot（注册表比对工具）
+19、添加 Wine 运行器评分数据的搜索功能
 <b>以下更新内容旧版本也适用（只限 2.1.0 及以上版本）</b>
 ※1、在“安装更多Wine”的Wine安装工具中上新 Wine
 ※2、云 Dll 工具上新 Dll