From ca88d5f62c5e71eb6160101d6db784d0881556b6 Mon Sep 17 00:00:00 2001 From: gfdgd_xi <3025613752@qq.com> Date: Wed, 16 Oct 2024 21:56:04 +0800 Subject: [PATCH] =?UTF-8?q?run.sh=E9=80=82=E9=85=8DGXDE=20OS=EF=BC=88https?= =?UTF-8?q?://gitee.com/gfdgd-xi/deep-wine-runner/issues/IAW3W3=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deepin-wine-easy-packager.py | 4 +++- package-script/template/run.sh | 4 +++- packager-config/run.sh | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/deepin-wine-easy-packager.py b/deepin-wine-easy-packager.py index b1470b8..2b6c8df 100755 --- a/deepin-wine-easy-packager.py +++ b/deepin-wine-easy-packager.py @@ -204,6 +204,8 @@ Get_Dist_Name() DISTRO='Deepin' elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then DISTRO='UniontechOS' + elif grep -Eqi "GXDE" /etc/issue || grep -Eq "GXDE" /etc/*-release; then + DISTRO='GXDE' elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then DISTRO='UniontechOS' else @@ -266,7 +268,7 @@ DISABLE_ATTACH_FILE_DIALOG="" ##############<<<<<<<<<禁用文件选择工具开始 Get_Dist_Name #此功能实现参见开头函数段 -if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then +if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ] && [ "$DISTRO" != "GXDE" ];then DISABLE_ATTACH_FILE_DIALOG="1" echo "非deepin/UOS,默认关闭系统自带的文件选择工具,使用Wine的" echo "如果你想改变这个行为,请到/opt/apps/$DEB_PACKAGE_NAME/files/$0处修改" diff --git a/package-script/template/run.sh b/package-script/template/run.sh index 6c150c3..739f8bd 100755 --- a/package-script/template/run.sh +++ b/package-script/template/run.sh @@ -24,6 +24,8 @@ Get_Dist_Name() DISTRO='UniontechOS' elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then DISTRO='UniontechOS' + elif grep -Eqi "GXDE" /etc/issue || grep -Eq "GXDE" /etc/*-release; then + DISTRO='GXDE' else DISTRO='OtherOS' fi @@ -70,7 +72,7 @@ DISABLE_ATTACH_FILE_DIALOG="" ##############<<<<<<<<<禁用文件选择工具开始 Get_Dist_Name #此功能实现参见开头函数段 -if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then +if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ] && [ "$DISTRO" != "GXDE" ];then DISABLE_ATTACH_FILE_DIALOG="1" echo "非deepin/UOS,默认关闭系统自带的文件选择工具,使用Wine的" echo "如果你想改变这个行为,请到/opt/apps/$DEB_PACKAGE_NAME/files/$0处修改" diff --git a/packager-config/run.sh b/packager-config/run.sh index d5a3bae..ca94c24 100644 --- a/packager-config/run.sh +++ b/packager-config/run.sh @@ -48,6 +48,8 @@ Get_Dist_Name() DISTRO='Deepin' elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then DISTRO='UniontechOS' + elif grep -Eqi "GXDE" /etc/issue || grep -Eq "GXDE" /etc/*-release; then + DISTRO='GXDE' elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then DISTRO='UniontechOS' else @@ -109,7 +111,7 @@ DISABLE_ATTACH_FILE_DIALOG="" ##############<<<<<<<<<禁用文件选择工具开始 Get_Dist_Name #此功能实现参见开头函数段 -if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then +if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ] && [ "$DISTRO" != "GXDE" ];then DISABLE_ATTACH_FILE_DIALOG="1" echo "非deepin/UOS,默认关闭系统自带的文件选择工具,使用Wine的" echo "如果你想改变这个行为,请到/opt/apps/$DEB_PACKAGE_NAME/files/$0处修改"