支持解压包时候显示进度条

Merge pull request !15 from RX6900XT/master

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

@@ -145,6 +145,7 @@ CallProcess()
     # Disable winemenubuilder
     env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v winemenubuilder.exe /f
     debug_log_to_file "Starting process $* ..."
+
 	#############  WARNING: Here is the modified content: Now will run set-dwine-scale.sh
 	/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh "$WINEPREFIX"
     env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" &
@@ -166,6 +167,26 @@ CalleCloud()
     CallProcess "$@"
 }
 
+CallQQMusic()
+{
+    if [ -e ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/QQMusic.exe ]; then
+    sleep 1
+    rm -rf ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.log
+    else
+       mkdir ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
+       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.dll ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
+       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.exe ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
+       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.rdb ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
+       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/*.log ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
+       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic/QQMusic* ${WINEPREFIX}/drive_c/Program\ Files/Tencent
+       rm -rf ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic
+       rm -rf ${WINEPREFIX}/drive_c/Program\ Files/Tencent/updatetemp
+       rm -rf ${WINEPREFIX}/drive_c/Program\ Files/Tencent/*.log
+       mv ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic* ${WINEPREFIX}/drive_c/Program\ Files/Tencent/QQMusic
+    fi
+    CallProcess "$@"
+}
+
 CallDouyin()
 {
     if [ -f "${WINEPREFIX}/drive_c/users/${USER}/Application Data/douyin" ]; then
@@ -532,6 +553,9 @@ CallApp()
 	    "IE8")
             CallIE8 "$@"
             ;;
+	    "Spark-QQMusic")
+            CallQQMusic "$@"
+            ;;
         *)        
             CallProcess "$@"
             ;;
@@ -540,7 +564,7 @@ CallApp()
 ExtractApp()
 {
 	mkdir -p "$1"
-	7z x "$APPDIR/$APPTAR" -o"$1"
+	7z x "$APPDIR/$APPTAR" -o"$1" -bsp1 -bb1 -bse2 | grep --line-buffered -oP "(\d+(\.\d+)?(?=%))" |   zenity --progress --title="$BOTTLENAME" --text="解包$BOTTLENAME中..."  --width=400 --auto-close --no-cancel
 	mv "$1/drive_c/users/@current_user@" "$1/drive_c/users/$USER"
 	sed -i "s#@current_user@#$USER#" $1/*.reg
     FixLink
@@ -600,9 +624,9 @@ RunApp()
         exit 0
     fi
  	if [ -d "$WINEPREFIX" ]; then
-        UpdateApp | progressbar "$BOTTLENAME" "更新$BOTTLENAME中..."
+        UpdateApp
  	else
-        DeployApp | progressbar $BOTTLENAME "初始化$BOTTLENAME中..."
+        DeployApp 
  	fi
 
     CallApp "$@"
@@ -634,23 +658,11 @@ ParseArgs()
 
 init_log_file
 
-# Check if some visual feedback is possible
-if command -v zenity >/dev/null 2>&1; then
-	progressbar()
-	{
-		WINDOWID="" zenity --progress --title="$1" --text="$2" --pulsate --width=400 --auto-close --no-cancel ||
-		WINDOWID="" zenity --progress --title="$1" --text="$2" --pulsate --width=400 --auto-close
-	}
-
-else
-	progressbar()
-	{
-		cat -
-	}
-fi
 
 
-#####准备启动进程，分析在 https://shenmo7192.gitee.io/post/deepin-wine6%E7%9A%84run_v4%E8%84%9A%E6%9C%AC%E6%8E%A2%E7%B4%A2%E5%90%AF%E5%8A%A8%E6%96%B9%E5%BC%8F/
+
+
+#####准备启动进程，分析在 https://blog.shenmo.tech/post/deepin-wine6%E7%9A%84run_v4%E8%84%9A%E6%9C%AC%E6%8E%A2%E7%B4%A2%E5%90%AF%E5%8A%A8%E6%96%B9%E5%BC%8F/
 if [ $# -lt 3 ]; then
     debug_log "参数个数小于3个"
     exit 0

spark-dwine-launch/postrm_template

@@ -2,12 +2,14 @@
 if [ "$1" = "remove" ] || [ "$1" = "purge" ];then
 
 echo "清理卸载残留"
-BOTTLE_NAME="" #容器名
-PACK_NAME=""   #软件包名
-ACTIVEX_NAME=""
+BOTTLE_NAME="" #在引号中填写容器名
+PACK_NAME=""   #在引号中填写软件包名
+ACTIVEX_NAME="" #activex相关，若未使用，可不设置
 MAKE_AUTOSTART="" #如果先前设置了开机自启，则在此处填写1
 
-### 以下为功能段，若只用于打包则以下内容可不看，只填写上方变量即可
+
+
+### 以下为功能段，若只用于打包则以下内容可不看，只填写上方即可
 
 make_autostart()
 {