From cd2e804407fc03ec2ab0004025ad49ef720d8318 Mon Sep 17 00:00:00 2001
From: gfdgd_xi <3025613752@qq.com>
Date: Tue, 16 Jul 2024 22:31:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 打包用例/run.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/打包用例/run.sh b/打包用例/run.sh
index d6f440a..901f1b3 100755
--- a/打包用例/run.sh
+++ b/打包用例/run.sh
@@ -40,11 +40,18 @@ BOTTLENAME="容器名"
 APPVER="版本号"
 EXEC_PATH="启动路径"
 ##### 软件在wine中的启动路径
-if [ -e "/opt/deepinwine/tools/spark_run_v4.sh"] ;then
-    START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
-else
+SHELL_DIR=$(dirname $(realpath $0))
+START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
+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
 ENABLE_DOT_NET=""
 ####若使用spark-wine时需要用到.net，则请把ENABLE_DOT_NET设为true，同时在依赖中写spark-wine7-mono
 #export BOX86_EMU_CMD="/opt/spark-box86/box86"