diff --git a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh index 65e4dd246975961fcff4db1eeec7e4f035a125df..7fc07e88bb6b271a048120a1515d4041d35a6233 100755 --- a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh +++ b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh @@ -1,5 +1,7 @@ #!/bin/bash +SHELL_DIR=$(dirname $(realpath $0)) + # 函数:获取所有应用列表 # 函数:获取所有应用列表 get_apps_list() { @@ -25,8 +27,8 @@ get_apps_list() { if [ -z "$version" ]; then version="无法读取" fi - - if grep -q "START_SHELL_PATH=\"/opt/deepinwine/tools/spark_run_v4.sh\"" "$run_script"; then + # START_SHELL_PATH=XXX/spark_run_v4.sh + if grep START_SHELL_PATH= "$run_script" | grep spark_run_v4.sh; then use_spark="是" fi fi @@ -63,7 +65,7 @@ select_app() { local app_dir="/opt/apps/$app" local run_script="$app_dir/files/run.sh" local use_spark="否" - if grep -q "START_SHELL_PATH=\"/opt/deepinwine/tools/spark_run_v4.sh\"" "$run_script"; then + if if grep START_SHELL_PATH= "$run_script" | grep spark_run_v4.sh; then use_spark="是" fi if [ "$use_spark" == "是" ]; then @@ -95,7 +97,7 @@ select_non_spark_action(){ local app_dir="/opt/apps/$app" local run_script="$app_dir/files/run.sh" local bottle_name=$(grep -oP 'BOTTLENAME="\K[^"]+' "$run_script") - /opt/deepinwine/tools/kill.sh ${bottle_name} + $SHELL_DIR/../kill.sh ${bottle_name} rm -rf /home/$(whoami)/.deepinwine/${bottle_name}/* zenity --info --width=300 --text="操作已完成,请重启Wine应用查看" ;; @@ -138,7 +140,7 @@ select_spark_action() { local app_dir="/opt/apps/$app" local run_script="$app_dir/files/run.sh" local bottle_name=$(grep -oP 'BOTTLENAME="\K[^"]+' "$run_script") - /opt/deepinwine/tools/spark_kill.sh ${bottle_name} + $SHELL_DIR/../spark_kill.sh ${bottle_name} rm -rf /home/$(whoami)/.deepinwine/${bottle_name}/* zenity --info --width=300 --text="操作已完成,请重启Wine应用查看" ;; @@ -181,7 +183,7 @@ select_scale_action() { if [ "$scale_factor" == "恢复默认" ];then rm $HOME/.deepinwine/$bottle_name/scale.txt else - /opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/scale-set-helper/set-wine-scale.sh -s "$scale_factor" "$HOME/.deepinwine/$bottle_name" + $SHELL_DIR/scale-set-helper/set-wine-scale.sh -s "$scale_factor" "$HOME/.deepinwine/$bottle_name" fi elif [ "$scale_type" == "全局" ]; then if [ "$scale_factor" == "恢复默认" ];then diff --git a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark_gl-wine/run_gl.sh b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark_gl-wine/run_gl.sh index 68118a967f0dae5e01f76b97a6bd11e026b9f74e..0d940e03b77c12f96beb1f61e99640b84c73dafa 100755 --- a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark_gl-wine/run_gl.sh +++ b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark_gl-wine/run_gl.sh @@ -2,7 +2,9 @@ cd $(dirname $0) +SHELL_DIR=$(dirname $(realpath $0)) runtime_path=/opt/deepinwine/runtime-i386 +echo $runtime_path if [ -f "$runtime_path/init_runtime.sh" ];then source "$runtime_path/init_runtime.sh" diff --git a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark_run_v4.sh b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark_run_v4.sh index b3143e9b1b16d4f606b5797cedb7068a749c5cf2..8aae271040566abef74133d373da450674f3524a 100755 --- a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark_run_v4.sh +++ b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark_run_v4.sh @@ -179,6 +179,10 @@ DisableWrite() is_autostart() { AUTOSTART="/opt/deepinwine/tools/autostart" + if [[ -f "$SHELL_DIR/autostart" ]]; then + # 如果打包时自带 autostart,则使用自带的 + AUTOSTART="$SHELL_DIR/autostart" + fi if [ -f "$AUTOSTART.all" ]&&[ -f "/opt/apps/$1/files/run.sh" ];then return 0 fi diff --git "a/\346\211\223\345\214\205\347\224\250\344\276\213/run.sh" "b/\346\211\223\345\214\205\347\224\250\344\276\213/run.sh" index d6f440af80bde8973212c2692a448e5a97a0cd34..901f1b3494f771e777d00dbd928cbf6a31f13464 100755 --- "a/\346\211\223\345\214\205\347\224\250\344\276\213/run.sh" +++ "b/\346\211\223\345\214\205\347\224\250\344\276\213/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"