spark-store-project/spark-wine
15
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-wine synced 2025-12-18 21:11:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复无法解包窗口

Browse Source
This commit is contained in:
shenmo
2023-11-22 10:45:41 +08:00
parent ccc53deceb
commit e77132f5a7
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh
View File

@@ -229,9 +229,18 @@ fi
} }
ExtractApp() ExtractApp()
{ {
local tmp_log=$(mktemp)
mkdir -p "$1" mkdir -p "$1"
# 7z x "$APPDIR/$APPTAR" -o"$1" -bsp1 -bb1 -bse2 | grep --line-buffered -oP "(\d+(\.\d+)?(?=%))" | zenity --progress --title="$BOTTLENAME" --text="${TRANSHELL_CONTENT_UNPACKING} $BOTTLENAME..." --width=400 --auto-close --no-cancel (7z x "$APPDIR/$APPTAR" -o"$1" -bsp1 -bb1 -bse2 | grep --line-buffered -oP "(\d+(\.\d+)?(?=%))" > $tmp_log)&
7z x "$APPDIR/$APPTAR" -o"$1"
cmd_pid=$!
(while kill -0 $cmd_pid 2> /dev/null; do
cat "${tmp_log}"
sleep 1
done)| zenity --progress --title="$BOTTLENAME" --text="${TRANSHELL_CONTENT_UNPACKING} $BOTTLENAME..." --width=400 --auto-close --no-cancel
mv "$1/drive_c/users/@current_user@" "$1/drive_c/users/$USER" mv "$1/drive_c/users/@current_user@" "$1/drive_c/users/$USER"
sed -i "s#@current_user@#$USER#" $1/*.reg sed -i "s#@current_user@#$USER#" $1/*.reg
FixLink FixLink
@@ -297,9 +306,9 @@ RunApp()
exit 0 exit 0
fi fi
if [ -d "$WINEPREFIX" ]; then if [ -d "$WINEPREFIX" ]; then
UpdateApp | progressbar "$BOTTLENAME" "${TRANSHELL_CONTENT_UNPACKING} $BOTTLENAME..." UpdateApp
else else
DeployApp | progressbar "$BOTTLENAME" "${TRANSHELL_CONTENT_UNPACKING} $BOTTLENAME..." DeployApp
fi fi
CallApp "$@" CallApp "$@"