fix: Can't read bottle name

Signed-off-by: shenmo <jifengshenmo@outlook.com>

spark-dwine-helper/postinst

@@ -2,6 +2,6 @@
 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
+
+ln -svf /opt/spark-dwine-helper/spark_run_v4.sh /opt/deepinwine/tools/spark_run_v4.sh
+ln -svf /opt/spark-dwine-helper/spark_kill.sh /opt/deepinwine/tools/spark_kill.sh

spark-dwine-helper/prerm

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

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

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

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

@@ -1,39 +0,0 @@
-# ===== Log =====
-# log.info xxx
-# log.warn xxx
-# log.info xxx
-# log.debug xxx
-# 带颜色的echo
-function log.color_output() {
-    local color=$1
-    shift 1
-
-    echo >&2 -e "\033[${color}m$@\033[0m"
-    return 0
-}
-
-# Log is named without prefix "utils." for convenience
-# Usage: log.log <level> ...content
-function log.log() {
-    if [[ $# < 2 ]]; then
-        return -1
-    fi
-
-    local level=$1
-    shift 1
-
-    case $level in
-    error) log.color_output "0;31" "[ERROR] $@" ;;
-    warn) log.color_output "1;33" "[WARN] $@" ;;
-    info) log.color_output "1;37" "[INFO] $@" ;;
-    debug) log.color_output "1;30" "[DEBUG] $@" ;;
-    esac
-
-    return 0
-}
-
-function log.error() { log.log "error" "$@"; }
-function log.warn() { log.log "warn" $@; }
-function log.info() { log.log "info" $@; }
-function log.debug() { log.log "debug" $@; }
-

spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/deepin-wine8-stable-wrapper/deepin-wine8-stable

@@ -1,38 +0,0 @@
-#!/bin/bash
-source $(dirname $0)/log-function.bashimport
-Get_Dist_Name()
-{
-    if grep -Eqii "Deepin" /etc/issue || grep -Eq "Deepin" /etc/*-release; then
-        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
-         DISTRO='OtherOS'
-        fi
-}
-
-
-
-
-
-Get_Dist_Name
-## 1. If WINEPREFIX is not set, use ~/.wine
-if [ "$WINEPREFIX" = "" ];then
-export WINEPREFIX=$HOME/.wine
-fi
-
-
-if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ]&& [ "$DISTRO" != "GXDE" ];then
-
-
-log.warn "WARNING:USING BOX64 INSTEAD OF DEEPIN-BOX64,SOME APP MAY FAIL TO LAUNCH"
-
-spark-box64 /opt/deepin-wine8-stable/bin/wine "$@"
-else
-deepin-wine8-stable "$@"
-fi
-

spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/deepin-wine8-stable-wrapper/log-function.bashimport

@@ -1,39 +0,0 @@
-# ===== Log =====
-# log.info xxx
-# log.warn xxx
-# log.info xxx
-# log.debug xxx
-# 带颜色的echo
-function log.color_output() {
-    local color=$1
-    shift 1
-
-    echo >&2 -e "\033[${color}m$@\033[0m"
-    return 0
-}
-
-# Log is named without prefix "utils." for convenience
-# Usage: log.log <level> ...content
-function log.log() {
-    if [[ $# < 2 ]]; then
-        return -1
-    fi
-
-    local level=$1
-    shift 1
-
-    case $level in
-    error) log.color_output "0;31" "[ERROR] $@" ;;
-    warn) log.color_output "1;33" "[WARN] $@" ;;
-    info) log.color_output "1;37" "[INFO] $@" ;;
-    debug) log.color_output "1;30" "[DEBUG] $@" ;;
-    esac
-
-    return 0
-}
-
-function log.error() { log.log "error" "$@"; }
-function log.warn() { log.log "warn" $@; }
-function log.info() { log.log "info" $@; }
-function log.debug() { log.log "debug" $@; }
-

spark-dwine-helper/s-wine-helper/opt/spark-dwine-helper/bashimport/log-function.bashimport

@@ -0,0 +1,5 @@
+#!/bin/bash
+log.warn() { echo -e "[\e[33mWARN\e[0m]:  \e[1m$*\e[0m"; }
+log.error()  { echo -e "[\e[31mERROR\e[0m]: \e[1m$*\e[0m"; }
+log.info() { echo -e "[\e[96mINFO\e[0m]:  \e[1m$*\e[0m"; }
+log.debug()  { echo -e "[\e[32mDEBUG\e[0m]: \e[1m$*\e[0m"; }

spark-dwine-helper/s-wine-helper/opt/spark-dwine-helper/spark-dwine-helper/scale-set-helper/get-scale.sh

@@ -9,13 +9,15 @@ 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
-	 DISTRO='OtherOS'
-	fi
+         DISTRO='OtherOS'
+        fi
 }
-#########<<<<<<<
+######<<<<<<<
 
 if [ $# -lt 1 ]; then
 echo "无参数，无法启动。这是一个set-wine-scale的组件，一般来说，你不会需要单独启动这个脚本"
@@ -47,7 +49,7 @@ fi
 
 
 Get_Dist_Name
-if  [ "$DISTRO" = "UniontechOS" ];then
+if  [ "$DISTRO" = "UniontechOS" ] || [ "$DISTRO" = "GXDE" ];then
 echo 1.0 > $HOME/.config/spark-wine/scale.txt
 cat $HOME/.config/spark-wine/scale.txt > $CONTAINER_PATH/scale.txt
 #####就是1倍缩放

spark-dwine-helper/s-wine-helper/opt/spark-dwine-helper/spark_run_v4.sh

@@ -24,6 +24,8 @@ function get_app_name() {
     
     if [ -z "$app_name_i18n" ]; then
         app_name="$app_name_orig"
+    elif [ -z "$app_name_orig" ]; then
+        app_name="自定义应用"
     else
         app_name="$app_name_i18n"
     fi
@@ -31,12 +33,12 @@ function get_app_name() {
     echo "$app_name"
 }
 ######### Vars
+BOTTLENAME=""
 BOTTLENAME="$1"
 WINEPREFIX="$HOME/.deepinwine/$1"
 APPDIR="/opt/apps/${DEB_PACKAGE_NAME}/files"
 APPVER=""
 APPTAR="files.7z"
-BOTTLENAME=""
 WINE_CMD="deepin-wine"
 #这里会被后续覆盖
 LOG_FILE=$0
@@ -65,14 +67,6 @@ if [ $APPRUN_CMD ]; then
     WINE_CMD=$APPRUN_CMD
 fi
 
-#####################
-
-if [ "$WINE_CMD" = "deepin-wine8-stable" ] && [ "$(arch)" != "x86_64" ];then
-
-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
-
 
 ##################### Functions
 	progressbar()

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

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

打包用例/run.sh

@@ -68,18 +68,18 @@ BOTTLENAME="容器名"
 APPVER="版本号"
 EXEC_PATH="启动路径"
 ##### 软件在wine中的启动路径
+## Priority Policy: 软件自带>spark-dwine-helper>deepin-wine-helper
 SHELL_DIR=$(dirname $(realpath $0))
-START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
+START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"  ## Fallback
+if [ -e "/opt/deepinwine/tools/spark_run_v4.sh" ] ;then
+    START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
+fi
+## If exist spark dwine helper, then use it as default
 if [ -e "$SHELL_DIR/deepinwine/tools/spark_run_v4.sh" ] ;then
     # 如果 helper 在 run.sh 相同目录的 deepinwine/tools/spark_run_v4.sh 则可以调用
     START_SHELL_PATH="$SHELL_DIR/deepinwine/tools/spark_run_v4.sh"
 fi
-if [ -e "/opt/deepinwine/tools/run_v4.sh" ] ;then
-    START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
-fi
-if [ -e "/opt/deepinwine/tools/spark_run_v4.sh" ] ;then
-    START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
-fi
+## If 
 ENABLE_DOT_NET=""
 ####若使用spark-wine时需要用到.net，则请把ENABLE_DOT_NET设为true，同时在依赖中写spark-wine7-mono
 #export BOX86_EMU_CMD="/opt/spark-box86/box86"
@@ -122,7 +122,7 @@ fi
 
 ##############<<<<<<<<<屏蔽mono和gecko安装器开始
 ##默认屏蔽mono和gecko安装器
-if [ "$APPRUN_CMD" = "spark-wine7-devel" ] || [ "$APPRUN_CMD" = "spark-wine" ]|| [ "$APPRUN_CMD" = "spark-wine8" ] && [ -z "$ENABLE_DOT_NET" ];then
+if [ "$APPRUN_CMD" = "spark-wine9" ] || [ "$APPRUN_CMD" = "spark-wine" ]|| [ "$APPRUN_CMD" = "spark-wine8" ] && [ -z "$ENABLE_DOT_NET" ];then
 
 #export WINEDLLOVERRIDES="mscoree=d,mshtml=d,control.exe=d"
 export WINEDLLOVERRIDES="control.exe=d"