mirror of
https://gitee.com/spark-store-project/spark-wine
synced 2025-12-18 21:11:39 +08:00
跟随上游改动
调整部署应用文案 修复:进度条跳动
This commit is contained in:
@@ -231,6 +231,9 @@ UnixUriToDosPath()
|
|||||||
#### CallApp段,根据容器名找专属优化,没有就走通用启动
|
#### CallApp段,根据容器名找专属优化,没有就走通用启动
|
||||||
CallApp()
|
CallApp()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
PID_BANNER=$!
|
||||||
|
|
||||||
FixLink
|
FixLink
|
||||||
debug_log "CallApp $BOTTLENAME arg count $#: $*"
|
debug_log "CallApp $BOTTLENAME arg count $#: $*"
|
||||||
if [ -f "/opt/apps/${DEB_PACKAGE_NAME}/files/pre_run.sh" ];then
|
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
|
source $APP_CONFIG_PATH
|
||||||
else
|
else
|
||||||
echo "$APP_CONFIG_PATH 文件不存在,执行通用启动"
|
echo "$APP_CONFIG_PATH 文件不存在,执行通用启动"
|
||||||
CallProcess "$@"
|
CallProcess "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
ExtractApp()
|
ExtractApp()
|
||||||
{
|
{
|
||||||
@@ -257,10 +261,10 @@ local tmp_log=$(mktemp)
|
|||||||
|
|
||||||
cmd_pid=$!
|
cmd_pid=$!
|
||||||
(while kill -0 $cmd_pid 2> /dev/null; do
|
(while kill -0 $cmd_pid 2> /dev/null; do
|
||||||
cat "${tmp_log}"
|
tail -n 1 "${tmp_log}"
|
||||||
sleep 1
|
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"
|
mv "$1/drive_c/users/@current_user@" "$1/drive_c/users/$USER"
|
||||||
@@ -420,4 +424,4 @@ case $4 in
|
|||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
@@ -1,2 +1,3 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
TRANSHELL_CONTENT_UNPACKING="Unpacking"
|
TRANSHELL_CONTENT_UNPACKING="Preparing the following APP:"
|
||||||
|
TRANSHELL_CONTENT_SPARK_WINDOWS_COMPATIBILITY_TOOL="Spark Windows APP Compatibility Helper"
|
||||||
|
|||||||
@@ -1,2 +1,3 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
TRANSHELL_CONTENT_UNPACKING="解包"
|
TRANSHELL_CONTENT_UNPACKING="正在为您准备以下应用:"
|
||||||
|
TRANSHELL_CONTENT_SPARK_WINDOWS_COMPATIBILITY_TOOL="星火Windows应用兼容助手"
|
||||||
|
|||||||
Reference in New Issue
Block a user