!15 QQMusic 支援自动升级

Merge pull request !15 from RX6900XT/master

spark-dwine-helper/build.sh

@@ -30,6 +30,7 @@ Section: utils
 Priority: extra
 Recommends: spark-dwine-helper-settings
 Multi-Arch: foreign
+Provides: store.spark-app.spark-dwine-helper(=$version)
 Replaces: store.spark-app.spark-dwine-helper(<=$version)
 Homepage: https://gitee.com/deepin-community-store/spark-wine
 Description: Spark Deepin Wine Helper
@@ -111,7 +112,7 @@ SIZE=`echo ${SIZE%%.*}`
 
 cat  << EOF >pkg/DEBIAN/control
 Package: spark-dwine-helper-settings
-Version: 1.1
+Version: 1.2
 Architecture: all
 Maintainer: shenmo <shenmo@spark-app.store>
 Installed-Size: $SIZE

spark-dwine-helper/postrm

@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ "$1" = "remove" ] || [ "$1" = "purge" ];then
 
 echo "清理卸载残留"

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

@@ -142,7 +142,7 @@ CallProcess()
     if [ -n "$MIME_TYPE" ]; then
         xdg-mime default "$DEB_PACKAGE_NAME".desktop "$MIME_TYPE"
     fi
-    # Unuse winemenubuilder
+    # 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
@@ -159,6 +159,33 @@ CallProcess()
 ###有设置mimetype和自动启动(这个暂时没分析)的功能
 
 ###########专属优化段：
+
+CalleCloud()
+{
+    DisableWrite ${WINEPREFIX}/drive_c/users/${USER}/Temp
+    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
@@ -391,6 +418,8 @@ CallQQGameV2()
     CallProcess "$1" -action:force_download -appid:${2} -pid:8 -bin_version:1.1.2.4 -loginuin: 
 }
 
+
+
 CallPsCs6()
 {
     #get file full path
@@ -417,13 +446,30 @@ CallPsCs6()
     CallProcess "$@"
 }
 
+CallIE8()
+{
+    rm -f "$WINEPREFIX/system.reg"
+    cp $APPDIR/system.reg "$WINEPREFIX/system.reg"
+    CallProcess "$@"
+}
+
 #####专属优化段结束
 
+UnixUriToDosPath()
+{
+    OPEN_FILE="$1"
+    if [ -f "$OPEN_FILE" ]; then
+        OPEN_FILE=$(realpath "$OPEN_FILE")
+        OPEN_FILE="z:$OPEN_FILE"
+        OPEN_FILE=$(echo $OPEN_FILE | sed -e 's/\//\\\\/g')
+    fi
+    echo $OPEN_FILE
+}
+
 #arg 1: exec file path
 #arg 2: autostart ,or exec arg 1
 #arg 3: exec arg 2
 
-
 #### CallApp段，根据容器名找专属优化，没有就走通用启动
 CallApp()
 {
@@ -437,10 +483,10 @@ CallApp()
         "Deepin-ZhuMu")
             CallZhuMu "$@"
             ;;
-        "Deepin-QQ"|"Wine-QQ"|"Spark-QQ")
+        "Deepin-QQ"|"Wine-QQ"|"Spark-QQ"|"Deepin-QQ-Spark")
             CallQQ "$@"
             ;;
-        "Deepin-TIM")
+        "Deepin-TIM"|"Spark-TIM")
             CallTIM "$@"
             ;;
         "Deepin-QQGame"*)
@@ -452,7 +498,7 @@ CallApp()
         "Deepin-WeChat")
             CallWeChat "$@"
             ;;
-        "Deepin-WXWork"|"Spark-WeCom")
+        "Deepin-WXWork"|"Spark-WeCom"|"wxwork-spark-uk")
             CallWXWork "$@"
             ;;
         "Deepin-Dding")
@@ -500,7 +546,16 @@ CallApp()
 	    "Spark-douyin")
             CallDouyin "$@"
             ;;
-        *)
+	    "Spark-ecloud")
+            CalleCloud "$@"
+            ;;
+	    "IE8")
+            CallIE8 "$@"
+            ;;
+	    "Spark-QQMusic")
+            CallQQMusic "$@"
+            ;;
+        *)        
             CallProcess "$@"
             ;;
     esac
@@ -589,10 +644,14 @@ ParseArgs()
 {
     if [ $# -eq 4 ];then
 	    RunApp "$3"
-    elif [ $# -eq 5 ];then
-	    RunApp "$3" "$5"
+    elif [ -f "$5" ];then
+	    if [ -n "$MIME_EXEC" ];then
+		    RunApp "$MIME_EXEC" "$(UnixUriToDosPath "$5")" "${@:6}"
+	    else
+		    RunApp "$3" "$(UnixUriToDosPath "$5")" "${@:6}"
+	    fi
     else
-	    RunApp "$3" "$5" "$6"
+	    RunApp "$3" "${@:5}"
     fi
 }
 

spark-dwine-helper/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh

@@ -10,6 +10,7 @@ CHOSEN_SETTINGS=`zenity --list \
        --column="操作" \
 	设置全局缩放 \
        设置单独应用缩放 \
+	一键将所有已安装应用的缩放设置改为与全局缩放一致 \
 	备注：以上操作仅对使用了spark-dwine-helper的应用生效 `
 
 echo "$CHOSEN_SETTINGS"
@@ -88,6 +89,10 @@ esac
 
 
 fi
+	;;
+	"一键将所有已安装应用的缩放设置改为与全局缩放一致")
+	find ${HOME}/.deepinwine/ -name "scale.txt" -type f -print -exec rm -rf {} \;
+	zenity --info --text="以下容器中的应用的缩放设置已与全局设置同步：\n`cd ${HOME}/.deepinwine/ && ls`" --width=500 --height=150
 	;;
 	"以上操作仅对使用了spark-dwine-helper的应用生效")
 	

spark-dwine-launch/postinst_template

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+PACK_NAME="" #软件包名
+BOTTLE_NAME="" #容器名
+ACTIVEX_NAME=""
+MAKE_AUTOSTART="" #若需要开机自启，则填写1
+
+
+make_autostart()
+{
+    for username in $(ls /home)
+    do
+        echo /home/$username
+        if [ -d "/home/$username/.config/autostart" ]
+        then
+            cp /opt/apps/$PACK_NAME/entries/applications/$PACK_NAME.desktop /home/$username/.config/autostart/
+            sed -i "s#%u#\"autostart\"#" /home/$username/.config/autostart/$PACK_NAME.desktop
+        fi
+    done
+}
+
+
+
+if [ -n "$MAKE_AUTOSTART" ]; then
+    make_autostart
+fi
+
+
+
+if [ -n "$ACTIVEX_NAME" ]; then
+    if [ ! -d "/usr/lib/mozilla/plugins" ];then
+        mkdir -p /usr/lib/mozilla/plugins
+    fi
+    cp /usr/local/share/pipelight/libpipelight.so /usr/lib/mozilla/plugins/libpipelight-$ACTIVEX_NAME.so
+fi
+
+# Make sure the script returns 0
+true
+
+

spark-dwine-launch/postrm_template

@@ -0,0 +1,58 @@
+#!/bin/bash
+if [ "$1" = "remove" ] || [ "$1" = "purge" ];then
+
+echo "清理卸载残留"
+BOTTLE_NAME="" #在引号中填写容器名
+PACK_NAME=""   #在引号中填写软件包名
+ACTIVEX_NAME="" #activex相关，若未使用，可不设置
+MAKE_AUTOSTART="" #如果先前设置了开机自启，则在此处填写1
+
+
+
+### 以下为功能段，若只用于打包则以下内容可不看，只填写上方即可
+
+make_autostart()
+{
+for username in $(ls /home)  
+    do
+      echo /home/$username
+        if [ -d "/home/$username/.config/autostart" ]
+        then
+            rm /home/$username/.config/autostart/$PACK_NAME.desktop
+        fi
+    done
+}
+
+
+
+if [ -n "$MAKE_AUTOSTART" ]; then
+    make_autostart
+fi
+
+
+if [ -n "$ACTIVEX_NAME" ]; then
+    rm /usr/lib/mozilla/plugins/libpipelight-$ACTIVEX_NAME.so
+fi
+
+
+if [ -z $BOTTLE_NAME ];then
+echo "W: 没有指定容器，跳过清理容器。请手动前往 ~/.deepinwine/ 下删除"
+exit
+fi
+
+if [ -e /opt/deepinwine/tools/kill.sh ];then
+/opt/deepinwine/tools/kill.sh $BOTTLE_NAME
+###这里注意，如果没写BOTTLE_NAME,会把QQ杀了
+fi
+
+for username in $(ls /home)  
+    do
+      echo /home/$username
+        if [ -d /home/$username/.deepinwine/$BOTTLE_NAME ]  
+        then
+        rm -rf /home/$username/.deepinwine/$BOTTLE_NAME
+        fi
+    done
+else
+echo "非卸载，跳过清理"
+fi

spark-dwine-launch/run-template_v1.sh

@@ -39,14 +39,16 @@ APPVER="版本号"
 EXEC_PATH="启动路径"
 ##### 软件在wine中的启动路径
 START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
+ENABLE_DOT_NET=""
+####若使用spark-wine7-devel时需要用到.net，则请把ENABLE_DOT_NET设为true，同时在依赖中写spark-wine7-mono
 export MIME_TYPE=""
-#####没什么用
+
 export DEB_PACKAGE_NAME="包名"
 ####这里写包名才能在启动的时候正确找到files.7z,似乎也和杀残留进程有关
 export APPRUN_CMD="deepin-wine6-stable"
 #####wine启动指令，建议
 #EXPORT_ENVS="wine的动态链接库路径"
-##例如我的wine应用是使用的dwine6的32位元容器，那么我要填LD_LIBRARY_PATH=$LD_LIBRARY;/opt/deepin-wine6-stable/lib
+##例如我的wine应用是使用的dwine6的32位容器，那么我要填LD_LIBRARY_PATH=$LD_LIBRARY;/opt/deepin-wine6-stable/lib
 ## 如果用不到就不填，不要删除前面的注释用的#
 
 export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH`
@@ -65,7 +67,7 @@ DISABLE_ATTACH_FILE_DIALOG=""
 
 ##############<<<<<<<<<禁用文件选择工具开始
 Get_Dist_Name
-#此功能实现参见结尾函数段
+#此功能实现参见开头函数段
 if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then
 DISABLE_ATTACH_FILE_DIALOG="1"
 echo "非deepin/UOS，默认关闭系统自带的文件选择工具，使用Wine的"
@@ -75,7 +77,15 @@ echo "To用户：打包者没有打开这个功能，这证明启用这个功能
 fi
 ##############>>>>>>>>>禁用文件选择工具结束
 
+##############<<<<<<<<<屏蔽mono和gecko安装器开始
+##默认屏蔽mono和gecko安装器
+if [ "$APPRUN_CMD" = "spark-wine7-devel" ] && [ -z "$ENABLE_DOT_NET"];then
 
+export WINEDLLOVERRIDES="mscoree,mshtml="
+#### "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"
+
+fi
+##############>>>>>>>>>屏蔽mono和gecko安装器结束
 
 #########################执行段