diff --git a/.idea/deepin-wine-run.iml b/.idea/deepin-wine-run.iml
index d0876a7..8437fe6 100644
--- a/.idea/deepin-wine-run.iml
+++ b/.idea/deepin-wine-run.iml
@@ -2,7 +2,7 @@
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index a2e120d..dc9ea49 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/deb/DEBIAN/control b/deb/DEBIAN/control
index 369d275..4aeab6d 100644
--- a/deb/DEBIAN/control
+++ b/deb/DEBIAN/control
@@ -1,9 +1,9 @@
Package: spark-deepin-wine-runner
-Version: 1.4.0
+Version: 1.4.1
Maintainer: gfdgd xi <3025613752@qq.com>
Homepage: https://gitee.com/gfdgd-xi/deep-wine-runner
Architecture: all
Priority: optional
-Depends: python3, python3-tk, python3-pip
+Depends: python3, python3-tk, python3-pip, python3-pil, python3-pil.imagetk
Description: gfdgd xi make's wine runner
diff --git a/deb/DEBIAN/postinst b/deb/DEBIAN/postinst
index caab250..0515ddf 100755
--- a/deb/DEBIAN/postinst
+++ b/deb/DEBIAN/postinst
@@ -1,3 +1,4 @@
-# !/bin/sh
-python3 -m pip install --upgrade pillow
-python3 -m pip install --upgrade ttkthemes
\ No newline at end of file
+# !/bin/sh
+python3 -m pip install --upgrade ttkthemes -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com
+# 向服务器返回安装数加1(不显示内容且忽略错误)
+curl http://120.25.153.144/spark-deepin-wine-runner/Install.php?Version=1.4.1 -s > /dev/null | true
diff --git a/deb/opt/apps/deepin-wine-runner/wine install b/deb/opt/apps/deepin-wine-runner/wine install
index 6ff90e1..0d87083 100755
--- a/deb/opt/apps/deepin-wine-runner/wine install
+++ b/deb/opt/apps/deepin-wine-runner/wine install
@@ -2,8 +2,8 @@
# 使用系统默认的 python3 运行
###########################################################################################
# 作者:gfdgd xi
-# 版本:1.4.0
-# 更新时间:2021年07月27日
+# 版本:1.4.1
+# 更新时间:2022年06月22日
# 感谢:感谢 wine 以及 deepin-wine 团队,提供了 wine 和 deepin-wine 给大家使用,让我能做这个程序
# 基于 Python3 的 tkinter 构建
###########################################################################################
@@ -34,15 +34,15 @@ if not choose == "N":
print("请问是否要安装 deepin-wine5(需要添加星火应用商店的源)?[Y/N]", end=' ')
choose = input().upper()
if not choose == "N":
- if os.path.exists("/etc/apt/sources.list.d/sparkstore-temp.list"):
- os.system("sudo rm -v /etc/apt/sources.list.d/sparkstore-temp.list")
+ if os.path.exists("/etc/apt/sources.list.d/sparkstore.list"):
+ os.system("sudo apt install deepin-wine5 -y")
if not os.path.exists("/etc/apt/sources.list.d/sparkstore.list"):
- os.system("sudo touch /etc/apt/sources.list.d/sparkstore-temp.list")
- os.system("echo 'deb [by-hash=force] https://d.store.deepinos.org.cn / ' | sudo tee '/etc/apt/sources.list.d/sparkstore-temp.list'")
+ os.system("sudo touch /etc/apt/sources.list.d/sparkstore.list")
+ os.system("echo 'deb [by-hash=force] https://d.store.deepinos.org.cn/ /' | sudo tee '/etc/apt/sources.list.d/sparkstore.list'")
+
os.system("sudo apt update")
os.system("sudo apt install deepin-wine5 -y")
- if os.path.exists("/etc/apt/sources.list.d/sparkstore-temp.list"):
- os.system("sudo rm -v /etc/apt/sources.list.d/sparkstore-temp.list")
+ if os.path.exists("/etc/apt/sources.list.d/sparkstore.list"):
os.system("sudo apt update")
print("请问是否要安装 deepin-wine5-stable?[Y/N]", end=' ')
choose = input().upper()
@@ -52,4 +52,8 @@ print("请问是否要安装 deepin-wine6-stable?[Y/N]", end=' ')
choose = input().upper()
if not choose == "N":
os.system("sudo apt install deepin-wine6-stable -y")
+print("请问是否要安装 spark-wine7-devel?[Y/N]", end=' ')
+choose = input().upper()
+if not choose == "N":
+ os.system("sudo apt install spark-wine7-devel -y")
print("全部完成!")
\ No newline at end of file
diff --git a/main.py b/main.py
index 87d3af5..7430b93 100755
--- a/main.py
+++ b/main.py
@@ -198,7 +198,7 @@ if not os.path.exists(get_home() + "/.config/deepin-wine-runner/WineBotton.json"
# 设置变量
###########################
# 如果要添加其他 wine,请在字典添加其名称和执行路径
-wine = {"deepin-wine": "deepin-wine", "deepin-wine5": "deepin-wine5", "wine": "wine", "wine64": "wine64", "deepin-wine5 stable": "deepin-wine5-stable", "deepin-wine6 stable": "deepin-wine6-stable"}
+wine = {"deepin-wine": "deepin-wine", "deepin-wine5": "deepin-wine5", "wine": "wine", "wine64": "wine64", "deepin-wine5 stable": "deepin-wine5-stable", "deepin-wine6 stable": "deepin-wine6-stable", "spark-wine7-devel": "spark-wine7-devel"}
shellHistory = list(json.loads(readtxt(get_home() + "/.config/deepin-wine-runner/ShellHistory.json")).values())
findExeHistory = list(json.loads(readtxt(get_home() + "/.config/deepin-wine-runner/FindExeHistory.json")).values())
wineBottonHistory = list(json.loads(readtxt(get_home() + "/.config/deepin-wine-runner/WineBottonHistory.json")).values())
@@ -209,7 +209,7 @@ wineBottonHistory = list(json.loads(readtxt(get_home() + "/.config/deepin-wine-r
###########################
iconPath = "{}/icon.png".format(os.path.split(os.path.realpath(__file__))[0])
programUrl = "https://gitee.com/gfdgd-xi/deep-wine-runner"
-version = "1.4.0"
+version = "1.4.1"
goodRunSystem = "Linux"
about = '''一个基于 Python3 的 tkinter 制作的 wine 运行器
版本:{}
diff --git a/wine install/AllInstall.py b/wine install/AllInstall.py
index 6ff90e1..0d87083 100755
--- a/wine install/AllInstall.py
+++ b/wine install/AllInstall.py
@@ -2,8 +2,8 @@
# 使用系统默认的 python3 运行
###########################################################################################
# 作者:gfdgd xi
-# 版本:1.4.0
-# 更新时间:2021年07月27日
+# 版本:1.4.1
+# 更新时间:2022年06月22日
# 感谢:感谢 wine 以及 deepin-wine 团队,提供了 wine 和 deepin-wine 给大家使用,让我能做这个程序
# 基于 Python3 的 tkinter 构建
###########################################################################################
@@ -34,15 +34,15 @@ if not choose == "N":
print("请问是否要安装 deepin-wine5(需要添加星火应用商店的源)?[Y/N]", end=' ')
choose = input().upper()
if not choose == "N":
- if os.path.exists("/etc/apt/sources.list.d/sparkstore-temp.list"):
- os.system("sudo rm -v /etc/apt/sources.list.d/sparkstore-temp.list")
+ if os.path.exists("/etc/apt/sources.list.d/sparkstore.list"):
+ os.system("sudo apt install deepin-wine5 -y")
if not os.path.exists("/etc/apt/sources.list.d/sparkstore.list"):
- os.system("sudo touch /etc/apt/sources.list.d/sparkstore-temp.list")
- os.system("echo 'deb [by-hash=force] https://d.store.deepinos.org.cn / ' | sudo tee '/etc/apt/sources.list.d/sparkstore-temp.list'")
+ os.system("sudo touch /etc/apt/sources.list.d/sparkstore.list")
+ os.system("echo 'deb [by-hash=force] https://d.store.deepinos.org.cn/ /' | sudo tee '/etc/apt/sources.list.d/sparkstore.list'")
+
os.system("sudo apt update")
os.system("sudo apt install deepin-wine5 -y")
- if os.path.exists("/etc/apt/sources.list.d/sparkstore-temp.list"):
- os.system("sudo rm -v /etc/apt/sources.list.d/sparkstore-temp.list")
+ if os.path.exists("/etc/apt/sources.list.d/sparkstore.list"):
os.system("sudo apt update")
print("请问是否要安装 deepin-wine5-stable?[Y/N]", end=' ')
choose = input().upper()
@@ -52,4 +52,8 @@ print("请问是否要安装 deepin-wine6-stable?[Y/N]", end=' ')
choose = input().upper()
if not choose == "N":
os.system("sudo apt install deepin-wine6-stable -y")
+print("请问是否要安装 spark-wine7-devel?[Y/N]", end=' ')
+choose = input().upper()
+if not choose == "N":
+ os.system("sudo apt install spark-wine7-devel -y")
print("全部完成!")
\ No newline at end of file
diff --git a/wine install/AllInstall.py~ b/wine install/AllInstall.py~
new file mode 100755
index 0000000..e69de29