修复拉屎

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

@@ -3,7 +3,8 @@
 ##load transhell
 function load_transhell_debug()
 {
-local WORK_PATH="$(cd "$(dirname "${0}")"  && pwd)"
+local WORK_PATH="$(dirname $(realpath $0))"
+echo $WORK_PATH
 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
@@ -15,7 +16,7 @@ echo "--------------------------------------------------------------------------
 
 function load_transhell()
 {
-local WORK_PATH="$(cd "$(dirname "${0}")"  && pwd)"
+local WORK_PATH="$(dirname $(realpath $0))"
 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

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

@@ -1,15 +1,15 @@
 #!/bin/bash
 
 ##### 若有pybanner则尝试启动
-if [ -e ${SHELL_DIR}/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..."
+#echo "Protocol upgrade: Trying to activate python banner..."
-python3 ${SHELL_DIR}/spark-dwine-helper/pybanner/pybanner.py
+#python3 ${SHELL_DIR}/spark-dwine-helper/pybanner/pybanner.py
-if [ "$?" = "0" ];then
+#if [ "$?" = "0" ];then
-exit
+#exit
-else
+#else
-echo "Failed to activate. Fallback to normal zenity."
+#echo "Failed to activate. Fallback to normal zenity."
-fi
+#fi
-fi
+#fi
 
 
 if [ ! -z "$WAYLAND_DISPLAY" ]; then

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

@@ -2,11 +2,6 @@
 #####因为arm版本的deepin-wine-helper不带这个，又不想破坏x86兼容性，故改名
 APP_NAME="QQ"
 LOG_FILE=$0
-SHELL_DIR=${0%/*}
-if [ $SPECIFY_SHELL_DIR ]; then
-    SHELL_DIR=$SPECIFY_SHELL_DIR
-fi
-
 PUBLIC_DIR="/var/public"
 
 UsePublicDir()

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

@@ -9,13 +9,13 @@
 #   Modifier:   shenmo <shenmo@spark-app.store>
 #		   
 #
-SHELL_DIR=$(dirname $0)
+SHELL_DIR=$(dirname $(realpath $0))
-SHELL_DIR=$(realpath "$SHELL_DIR")
+
-if [ $SPECIFY_SHELL_DIR ]; then
-    SHELL_DIR=$SPECIFY_SHELL_DIR
-fi
 export SHELL_DIR
 source ${SHELL_DIR}/bashimport/log-function.bashimport
+source ${SHELL_DIR}/bashimport/transhell.bashimport 
+load_transhell_debug
+
 #########Preload functions
 function get_app_name() {
     local app_name_orig=$(grep -m 1 '^Name=' "/usr/share/applications/$1.desktop" | cut -d '=' -f 2)
@@ -73,11 +73,6 @@ WINE_CMD="${SHELL_DIR}/spark-dwine-helper/deepin-wine8-stable-wrapper/deepin-win
 log.warn "Using deepin-wine8-stable wrapper to fix arm problem"
 fi
 
-#####################
-
-if [ $SPECIFY_SHELL_DIR ]; then
-    SHELL_DIR=$SPECIFY_SHELL_DIR
-fi
 
 ##################### Functions
 	progressbar()
@@ -262,6 +257,7 @@ CallProcess()
 
 	#############  WARNING: Here is the modified content: Now will run set-dwine-scale.sh
 	${SHELL_DIR}/spark-dwine-helper/scale-set-helper/set-wine-scale.sh "$WINEPREFIX"
+	$SHELL_DIR/spark-wine-banner &
     env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@"
 
     #start autobottle
@@ -296,7 +292,7 @@ CallApp()
 {
 
 
-    $SHELL_DIR/spark-wine-banner &
+    
     FixLink
     debug_log "CallApp $BOTTLENAME arg count $#: $*"
     if [ -f "/opt/apps/${DEB_PACKAGE_NAME}/files/pre_run.sh" ];then