跟随上游改动

调整部署应用文案
修复:进度条跳动
This commit is contained in:
2024-01-22 19:00:21 +08:00
parent 7facfd4355
commit 2a23a978d6
3 changed files with 13 additions and 7 deletions

View File

@@ -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
exit 0

View File

@@ -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"

View File

@@ -1,2 +1,3 @@
#!/bin/bash
TRANSHELL_CONTENT_UNPACKING="解包"
TRANSHELL_CONTENT_UNPACKING="正在为您准备以下应用:"
TRANSHELL_CONTENT_SPARK_WINDOWS_COMPATIBILITY_TOOL="星火Windows应用兼容助手"