From 2a23a978d603b47ec1fbc4d202b1b371c5f08524 Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Mon, 22 Jan 2024 19:00:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=9F=E9=9A=8F=E4=B8=8A=E6=B8=B8=E6=94=B9?=
 =?UTF-8?q?=E5=8A=A8=20=E8=B0=83=E6=95=B4=E9=83=A8=E7=BD=B2=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E6=96=87=E6=A1=88=20=E4=BF=AE=E5=A4=8D=EF=BC=9A?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=E8=B7=B3=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-wine-helper/deepinwine/tools/spark_run_v4.sh | 14 +++++++++-----
 .../transhell/spark_run_v4.sh_en_US.transhell      |  3 ++-
 .../transhell/spark_run_v4.sh_zh_CN.transhell      |  3 ++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh b/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh
index d806fe7..170d085 100755
--- a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh
+++ b/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh
@@ -231,6 +231,9 @@ UnixUriToDosPath()
 #### CallApp段，根据容器名找专属优化，没有就走通用启动
 CallApp()
 {
+
+PID_BANNER=$!
+    
     FixLink
     debug_log "CallApp $BOTTLENAME arg count $#: $*"
     if [ -f "/opt/apps/${DEB_PACKAGE_NAME}/files/pre_run.sh" ];then
@@ -245,9 +248,10 @@ if [ -f "$APP_CONFIG_PATH" ]; then
   source $APP_CONFIG_PATH
 else
   echo "$APP_CONFIG_PATH 文件不存在，执行通用启动"
-  CallProcess "$@"
+  CallProcess "$@" 
 fi
 
+
 }
 ExtractApp()
 {
@@ -257,10 +261,10 @@ local tmp_log=$(mktemp)
 
 	cmd_pid=$!
 (while kill -0 $cmd_pid 2> /dev/null; do
-        cat "${tmp_log}"
+        tail -n 1 "${tmp_log}"
         sleep 1
-    done)|  zenity --progress --title="$BOTTLENAME" --text="${TRANSHELL_CONTENT_UNPACKING} $BOTTLENAME..."  --width=400 --auto-close --no-cancel 
-
+    done)|  zenity --progress --title="${TRANSHELL_CONTENT_SPARK_WINDOWS_COMPATIBILITY_TOOL}" --text="${TRANSHELL_CONTENT_UNPACKING} $BOTTLENAME..."  --width=600 --auto-close --no-cancel 
+rm $tmp_log
 
 
 	mv "$1/drive_c/users/@current_user@" "$1/drive_c/users/$USER"
@@ -420,4 +424,4 @@ case $4 in
 		exit 1
 		;;
 esac
-exit 0
\ No newline at end of file
+exit 0
diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/transhell/spark_run_v4.sh_en_US.transhell b/spark-dwine-helper/s-wine-helper/deepinwine/tools/transhell/spark_run_v4.sh_en_US.transhell
index 08d0924..0ea82ee 100644
--- a/spark-dwine-helper/s-wine-helper/deepinwine/tools/transhell/spark_run_v4.sh_en_US.transhell
+++ b/spark-dwine-helper/s-wine-helper/deepinwine/tools/transhell/spark_run_v4.sh_en_US.transhell
@@ -1,2 +1,3 @@
 #!/bin/bash
-TRANSHELL_CONTENT_UNPACKING="Unpacking"
+TRANSHELL_CONTENT_UNPACKING="Preparing the following APP:"
+TRANSHELL_CONTENT_SPARK_WINDOWS_COMPATIBILITY_TOOL="Spark Windows APP Compatibility Helper"
diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/transhell/spark_run_v4.sh_zh_CN.transhell b/spark-dwine-helper/s-wine-helper/deepinwine/tools/transhell/spark_run_v4.sh_zh_CN.transhell
index 1d7528b..78ef2f8 100644
--- a/spark-dwine-helper/s-wine-helper/deepinwine/tools/transhell/spark_run_v4.sh_zh_CN.transhell
+++ b/spark-dwine-helper/s-wine-helper/deepinwine/tools/transhell/spark_run_v4.sh_zh_CN.transhell
@@ -1,2 +1,3 @@
 #!/bin/bash
-TRANSHELL_CONTENT_UNPACKING="解包"
+TRANSHELL_CONTENT_UNPACKING="正在为您准备以下应用："
+TRANSHELL_CONTENT_SPARK_WINDOWS_COMPATIBILITY_TOOL="星火Windows应用兼容助手"