不再往系统拉屎

spark-dwine-helper/build.sh

@@ -38,11 +38,12 @@ Description: Spark Deepin Wine Helper
 
 EOF
 
-cp postrm pkg/DEBIAN/postrm
 
+cp postinst pkg/DEBIAN/postinst
+cp prerm pkg/DEBIAN/prerm
 
-chmod +x pkg/DEBIAN/postrm
+chmod +x pkg/DEBIAN/postinst
-
+chmod +x pkg/DEBIAN/prerm
 cd pkg && fakeroot dpkg-deb -Z xz -b . ../
 cd ..
 
@@ -56,7 +57,7 @@ cat  << EOF >pkg/opt/apps/store.spark-app.spark-dwine-helper/info
     "appid": "store.spark-app.spark-dwine-helper",
     "name": "store.spark-app.spark-dwine-helper",
     "version": "$version",
-    "arch": ["amd64,arm64,mipsel64,sw64"],
+    "arch": ["amd64,arm64"],
     "permissions": {
         "autostart": false,
         "notification": false,

spark-dwine-helper/postinst

@@ -0,0 +1,7 @@
+#!/bin/bash
+if [ ! -d /opt/deepinwine/tools ];then
+mkdir -p /opt/deepinwine/tools
+fi
+if [ ! -e /opt/deepinwine/tools/spark_run_v4.sh ];then
+ln -sv /opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark_run_v4.sh /opt/deepinwine/tools/spark_run_v4.sh
+fi

spark-dwine-helper/postrm

@@ -1,15 +0,0 @@
-#!/bin/bash
-if [ "$1" = "remove" ] || [ "$1" = "purge" ];then
-
-echo "清理卸载残留"
-for username in $(ls /home)  
-    do
-      echo /home/$username
-        if [ -d /home/$username/.config/spark-wine ]  
-        then
-        rm -rf /home/$username/.config/spark-wine
-        fi
-    done
-else
-echo "非卸载，跳过清理"
-fi

spark-dwine-helper/prerm

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if [ -e /opt/deepinwine/tools/spark_run_v4.sh ];then
+unlink /opt/deepinwine/tools/spark_run_v4.sh
+fi

spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/entries/applications/store.spark-app.spark-dwine-helper.desktop

@@ -1,12 +1,12 @@
 [Desktop Entry]
 Categories=Utility;
 Encoding=UTF-8
-Exec=bash -c "/opt/durapps/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh"
+Exec=bash -c "/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh"
 Icon=store.spark-app.spark-dwine-helper
 MimeType=
 Name=Spark Wine App Launcher
 Name[zh_CN]=星火Wine应用启动器
-StartupWMClass=spark-dwine-helper-settings
+StartupWMClass=store.spark-app.spark-dwine-helper
 Terminal=False
 Type=Application
 NoDisplay=false

spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/bashimport/transhell.bashimport

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+##load transhell
+function load_transhell_debug()
+{
+local WORK_PATH="$(cd "$(dirname "${0}")"  && pwd)"
+local CURRENT_LANG="$(echo ${LANG%.*})"
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell ..."; fi
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell ..."; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi
+
+echo "-----------------------------------------------------------------------------"
+}
+
+function load_transhell()
+{
+local WORK_PATH="$(cd "$(dirname "${0}")"  && pwd)"
+local CURRENT_LANG="$(echo ${LANG%.*})"
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; fi
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi
+
+}
+
+function update_transhell()
+{
+load_transhell $@
+}
+

spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/scale-set-helper/get-scale.sh

@@ -1,5 +1,5 @@
 #/bin/bash
-source /opt/durapps/transhell/transhell.sh
+source ${SHELL_DIR}/bashimport/transhell.bashimport
 load_transhell_debug
 
 #########>>>>>>>函数段

spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/scale-set-helper/set-wine-scale.sh

@@ -32,7 +32,7 @@ parse_args() {
 	;;
 
 	"bunny")
-		cat /opt/durapps/spark-dwine-helper/scale-set-helper/bunny.txt
+		cat ${SHELL_DIR}/spark-dwine-helper/scale-set-helper/bunny.txt
 	exit
 
 	;;
@@ -68,7 +68,7 @@ if [ ! -f "$CONTAINER_PATH/scale.txt" ];then
 	if [ "$DEEPIN_WINE_SCALE" = "" ];then
 		echo "E: No DEEPIN_WINE_SCALE found. Use get-scale.sh to Set "
 		echo "错误：没有检测到DEEPIN_WINE_SCALE，用get-scale.sh设置"
-		/opt/durapps/spark-dwine-helper/scale-set-helper/get-scale.sh "$CONTAINER_PATH"
+		${SHELL_DIR}/spark-dwine-helper/scale-set-helper/get-scale.sh "$CONTAINER_PATH"
 		wine_scale=`cat $CONTAINER_PATH/scale.txt`
 		echo "检测到的缩放倍数为:$wine_scale"
 		echo "Scale is $wine_scale"

spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-wine-banner

@@ -1,9 +1,9 @@
 #!/bin/bash
 
 ##### 若有pybanner则尝试启动
-if [ -e /opt/durapps/spark-dwine-helper/pybanner/pybanner.py ];then
+if [ -e ${SHELL_DIR}/spark-dwine-helper/pybanner/pybanner.py ];then
 echo "Protocol upgrade: Trying to activate python banner..."
-python3 /opt/durapps/spark-dwine-helper/pybanner/pybanner.py
+python3 ${SHELL_DIR}/spark-dwine-helper/pybanner/pybanner.py
 if [ "$?" = "0" ];then
 exit
 else

spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark_run_v4.sh

@@ -9,10 +9,13 @@
 #   Modifier:   shenmo <shenmo@spark-app.store>
 #		   
 #
-
+SHELL_DIR=$(dirname $0)
-source /opt/durapps/transhell/transhell.sh
+SHELL_DIR=$(realpath "$SHELL_DIR")
-load_transhell_debug
+if [ $SPECIFY_SHELL_DIR ]; then
-source $(dirname $0)/log-function.bashimport
+    SHELL_DIR=$SPECIFY_SHELL_DIR
+fi
+export SHELL_DIR
+source ${SHELL_DIR}/bashimport/log-function.bashimport
 #########Preload functions
 function get_app_name() {
     local app_name_orig=$(grep -m 1 '^Name=' "/usr/share/applications/$1.desktop" | cut -d '=' -f 2)
@@ -56,11 +59,7 @@ else
 UNPACK_CMD=7z
 log.debug "Using system 7z as unpacker"
 fi
-SHELL_DIR=$(dirname $0)
+
-SHELL_DIR=$(realpath "$SHELL_DIR")
-if [ $SPECIFY_SHELL_DIR ]; then
-    SHELL_DIR=$SPECIFY_SHELL_DIR
-fi
 
 if [ $APPRUN_CMD ]; then
     WINE_CMD=$APPRUN_CMD
@@ -70,7 +69,7 @@ fi
 
 if [ "$WINE_CMD" = "deepin-wine8-stable" ] && [ "$(arch)" != "x86_64" ];then
 
-WINE_CMD="/opt/durapps/spark-dwine-helper/deepin-wine8-stable-wrapper/deepin-wine8-stable"
+WINE_CMD="${SHELL_DIR}/spark-dwine-helper/deepin-wine8-stable-wrapper/deepin-wine8-stable"
 log.warn "Using deepin-wine8-stable wrapper to fix arm problem"
 fi
 
@@ -200,7 +199,7 @@ is_autostart()
 
 Test_GL_wine()
 {
-    gl_wine_path="/opt/deepinwine/tools/spark_gl-wine"
+    gl_wine_path="${SHELL_DIR}/spark_gl-wine"
 
     #如果不支持32的GLX,d3d改为gdi的实现
     if [[ ! -f "${WINEPREFIX}/.init_d3d" ]];then
@@ -262,7 +261,7 @@ CallProcess()
     debug_log "Starting process $* ..."
 
 	#############  WARNING: Here is the modified content: Now will run set-dwine-scale.sh
-	/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh "$WINEPREFIX"
+	${SHELL_DIR}/spark-dwine-helper/scale-set-helper/set-wine-scale.sh "$WINEPREFIX"
     env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@"
 
     #start autobottle
@@ -304,9 +303,11 @@ CallApp()
         source "/opt/apps/${DEB_PACKAGE_NAME}/files/pre_run.sh"
         CallPreRun "$@"
     fi
-
+if [ -e  "/opt/deepinwine/tools/spark_run_v4_app_configs/${BOTTLENAME}.sh" ];then
 APP_CONFIG_PATH="/opt/deepinwine/tools/spark_run_v4_app_configs/${BOTTLENAME}.sh"
-
+else
+APP_CONFIG_PATH="${SHELL_DIR}/spark_run_v4_app_configs/${BOTTLENAME}.sh"
+fi
 if [ -f "$APP_CONFIG_PATH" ]; then
   echo "执行 ${BOTTLENAME}.sh ..."
   source $APP_CONFIG_PATH

spark-dwine-helper/s-wine-helper/usr/share/applications/store.spark-app.spark-dwine-helper.desktop

@@ -1,13 +0,0 @@
-[Desktop Entry]
-Categories=Utility;
-Encoding=UTF-8
-Exec=bash -c "/opt/durapps/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh"
-Icon=store.spark-app.spark-dwine-helper
-MimeType=
-Name=Spark Wine App Launcher
-Name[zh_CN]=星火Wine应用启动器
-StartupWMClass=spark-dwine-helper-settings
-Terminal=False
-Type=Application
-NoDisplay=false
-X-Deepin-Vendor=user-custom