!7 容器优化段以及启动器更正段

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

dwine-helper-backup/README.txt

@@ -0,0 +1 @@
+这是一个原版的run_v4留档，以后deepin更新的时候用来diff，这样转spark_run_v4会比较方便

dwine-helper-backup/run_v4.sh

@@ -0,0 +1,631 @@
+#!/bin/bash
+
+#   Copyright (C) 2016 Deepin, Inc.
+#
+#   Author:     Li LongYu <lilongyu@linuxdeepin.com>
+#               Peng Hao <penghao@linuxdeepin.com>
+
+WINEPREFIX="$HOME/.deepinwine/@public_bottle_name@"
+APPDIR="/opt/deepinwine/apps/@public_bottle_name@"
+APPVER="@deb_version_string@"
+APPTAR="files.7z"
+BOTTLENAME=""
+WINE_CMD="deepin-wine"
+LOG_FILE=$0
+PUBLIC_DIR="/var/public"
+
+SHELL_DIR=$(dirname $0)
+SHELL_DIR=$(realpath "$SHELL_DIR")
+if [ $SPECIFY_SHELL_DIR ]; then
+    SHELL_DIR=$SPECIFY_SHELL_DIR
+fi
+
+if [ $APPRUN_CMD ]; then
+    WINE_CMD=$APPRUN_CMD
+fi
+
+if [ $SPECIFY_SHELL_DIR ]; then
+    SHELL_DIR=$SPECIFY_SHELL_DIR
+fi
+
+UsePublicDir()
+{
+    if [ -z "$USE_PUBLIC_DIR" ]; then
+        echo "Don't use public dir"
+        return 1
+    fi
+    if [ ! -d "$PUBLIC_DIR" ];then
+        echo "Not found $PUBLIC_DIR"
+        return 1
+    fi
+    if [ ! -r "$PUBLIC_DIR" ];then
+        echo "Can't read for $PUBLIC_DIR"
+        return 1
+    fi
+    if [ ! -w "$PUBLIC_DIR" ];then
+        echo "Can't write for $PUBLIC_DIR"
+        return 1
+    fi
+    if [ ! -x "$PUBLIC_DIR" ];then
+        echo "Can't excute for $PUBLIC_DIR"
+        return 1
+    fi
+
+    return 0
+}
+
+_DeleteRegistry()
+{
+    env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg DELETE "$1" /f &> /dev/null
+}
+
+init_log_file()
+{
+    if [ ! -d "$DEBUG_LOG" ];then
+        return
+    fi
+
+    LOG_DIR=$(realpath $DEBUG_LOG)
+    if [ -d "$LOG_DIR" ];then
+        LOG_FILE="${LOG_DIR}/${LOG_FILE##*/}.log"
+        echo "" > "$LOG_FILE"
+        debug_log "LOG_FILE=$LOG_FILE"
+    fi
+}
+
+debug_log_to_file()
+{
+    if [ -d "$DEBUG_LOG" ];then
+        echo -e "${1}" >> "$LOG_FILE"
+    fi
+}
+
+debug_log()
+{
+    echo "${1}"
+}
+
+HelpApp()
+{
+	echo " Extra Commands:"
+	echo " -r/--reset     Reset app to fix errors"
+	echo " -e/--remove    Remove deployed app files"
+	echo " -h/--help      Show program help info"
+}
+
+FixLink()
+{
+    if [ -d ${WINEPREFIX} ]; then
+        CUR_DIR=$PWD
+        cd "${WINEPREFIX}/dosdevices"
+        rm c: z: y:
+        ln -s -f ../drive_c c:
+        ln -s -f / z:
+        ln -s -f $HOME y:
+        cd $CUR_DIR
+        ls -l "${WINEPREFIX}/dosdevices"
+    fi
+}
+
+DisableWrite()
+{
+    if [ -d "${1}" ]; then
+        chmod +w "${1}"
+        rm -rf "${1}"
+    fi
+
+    mkdir "${1}"
+    chmod -w "${1}"
+}
+
+is_autostart()
+{
+    AUTOSTART="/opt/deepinwine/tools/autostart"
+    if [ -f "$AUTOSTART.all" ]&&[ -f "/opt/apps/$1/files/run.sh" ];then
+        return 0
+    fi
+
+    if [ -f $AUTOSTART ];then
+        grep -c "$1" $AUTOSTART > /dev/null
+        return $?
+    fi
+
+    return 1
+}
+
+#arg 1: windows process file path
+#arg 2-*: windows process args
+CallProcess()
+{
+    #get file full path
+    path="$1"
+    path=$(echo ${path/c:/${WINEPREFIX}/drive_c})
+    path=$(echo ${path//\\/\/})
+
+    #kill bloack process
+    is_autostart $DEB_PACKAGE_NAME
+    autostart=$?
+    if [ $autostart -ne 0 ];then
+        $SHELL_DIR/kill.sh "$BOTTLENAME" block
+    fi
+
+    #change current dir to excute path
+    path=$(dirname "$path")
+    cd "$path"
+    pwd
+
+    #Set default mime type
+    if [ -n "$MIME_TYPE" ]; then
+        xdg-mime default "$DEB_PACKAGE_NAME".desktop "$MIME_TYPE"
+    fi
+
+    debug_log_to_file "Starting process $* ..."
+
+    env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" &
+
+    #start autobottle
+    if [ $autostart -eq 0 ];then
+        $SHELL_DIR/autostart_wine.sh $DEB_PACKAGE_NAME
+    fi
+}
+
+CallZhuMu()
+{
+    #change current dir to excute path
+    path=$(dirname "$path")
+    cd "$path"
+    pwd
+
+    #Set default mime type
+    if [ -n "$MIME_TYPE" ]; then
+        xdg-mime default "$DEB_PACKAGE_NAME".desktop "$MIME_TYPE"
+    fi
+
+    debug_log_to_file "Starting process $* ..."
+    if [ -n "$2" ];then
+        env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$1" "--url=$2" &
+    else
+        env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$1" &
+    fi
+}
+
+CallQQGame()
+{
+    debug_log "run $1"
+    $SHELL_DIR/kill.sh qqgame block
+    env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$1" &
+}
+
+CallQQ()
+{
+    if [ ! -f "$WINEPREFIX/../.QQ_run" ]; then
+        debug_log "first run time"
+        $SHELL_DIR/add_hotkeys
+        $SHELL_DIR/fontconfig
+        touch "$WINEPREFIX/../.QQ_run"
+    fi
+
+    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Tencent/QQ/Bin/QQLiveMPlayer"
+    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Tencent/QQ/Bin/QQLiveMPlayer1"
+    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Tencent/QzoneMusic"
+
+    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Tencent/QQBrowser"
+    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Common Files/Tencent/QQBrowser"
+    DisableWrite "${WINEPREFIX}/drive_c/users/Public/Application Data/Tencent/QQBrowserBin"
+    DisableWrite "${WINEPREFIX}/drive_c/users/Public/Application Data/Tencent/QQBrowserDefault"
+    DisableWrite "${WINEPREFIX}/drive_c/users/${USER}/Application Data/Tencent/QQBrowserDefault"
+
+    DisableWrite "${WINEPREFIX}/drive_c/users/Public/Application Data/Tencent/QQPCMgr"
+    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Common Files/Tencent/QQPCMgr"
+
+    DisableWrite "${WINEPREFIX}/drive_c/Program Files/Common Files/Tencent/HuaYang"
+    DisableWrite "${WINEPREFIX}/drive_c/users/${USER}/Application Data/Tencent/HuaYang"
+
+    CallProcess "$@"
+}
+
+CallTIM()
+{
+    if [ ! -f "$WINEPREFIX/../.QQ_run" ]; then
+        debug_log "first run time"
+        $SHELL_DIR/add_hotkeys
+        $SHELL_DIR/fontconfig
+        # If the bottle not exists, run reg may cost lots of times
+        # So create the bottle befor run reg
+        env WINEPREFIX="$WINEPREFIX" $WINE_CMD uninstaller --list
+        touch $WINEPREFIX/../.QQ_run
+    fi
+
+    CallProcess "$@"
+
+    #disable Tencent MiniBrowser
+    _DeleteRegistry "HKCU\\Software\\Tencent\\MiniBrowser"
+}
+
+CallWeChat()
+{
+    export DISABLE_RENDER_CLIPBOARD=1
+    CallProcess "$@"
+}
+
+CallWangWang()
+{
+    chmod 700 "$WINEPREFIX/drive_c/Program Files/AliWangWang/9.12.10C/wwbizsrv.exe"
+    chmod 700 "$WINEPREFIX/drive_c/Program Files/Alibaba/wwbizsrv/wwbizsrv.exe"
+    if [ $# = 3 ] && [ -z "$3" ];then
+        EXEC_PATH="c:/Program Files/AliWangWang/9.12.10C/WWCmd.exe"
+        env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$EXEC_PATH" "$2" &
+    else
+    	CallProcess "$@"
+    fi
+}
+
+CallWXWork()
+{
+    if [ -d "${WINEPREFIX}/drive_c/users/${USER}/Application Data/Tencent/WXWork/Update" ]; then
+        rm -rf "${WINEPREFIX}/drive_c/users/${USER}/Application Data/Tencent/WXWork/Update"
+    fi
+    if [ -d "${WINEPREFIX}/drive_c/users/${USER}/Application Data/Tencent/WXWork/upgrade" ]; then
+        rm -rf "${WINEPREFIX}/drive_c/users/${USER}/Application Data/Tencent/WXWork/upgrade"
+    fi
+    #Support use native file dialog
+
+    CallProcess "$@"
+}
+
+CallDingTalk()
+{
+    debug_log "run $1"
+    $SHELL_DIR/kill.sh DingTalk block
+
+    CallProcess "$@"
+}
+
+urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; }
+
+CallMeiTuXiuXiu()
+{
+    #set -- "$1" "${2#file://*}"
+    local path=$(urldecode "$2")
+    path=${path/file:\/\//}
+    set -- "$1" $path
+    CallProcess "$@"
+}
+
+CallFastReadPDF()
+{
+    #set -- "$1" "${2#file://*}"
+    local path=$(urldecode "$2")
+    path=${path/file:\/\//}
+    set -- "$1" $path
+    CallProcess "$@"
+}
+
+CallEvernote()
+{
+    local path=$(urldecode "$2")
+    path=${path/file:\/\//}
+    set -- "$1" $path
+    CallProcess "$@"
+}
+
+CallTencentVideo()
+{
+    if [ -f "${WINEPREFIX}/drive_c/Program Files/Tencent/QQLive/Upgrade.dll" ]; then
+        rm -rf "${WINEPREFIX}/drive_c/Program Files/Tencent/QQLive/Upgrade.dll"
+    fi
+
+    CallProcess "$@"
+}
+
+CallFoxmail()
+{
+    sed -i '/LogPixels/d' ${WINEPREFIX}/user.reg
+    CallProcess "$@"
+}
+
+CallTHS()
+{
+    $SHELL_DIR/kill.sh ths block
+
+    debug_log "Start run $1"
+    #get file full path
+    path="$1"
+    path=$(echo ${path/c:/${WINEPREFIX}/drive_c})
+    path=$(echo ${path//\\/\/})
+
+    #kill bloack process
+    name="${path##*/}"
+    $SHELL_DIR/kill.sh "$name" block
+
+    #change current dir to excute path
+    path=$(dirname "$path")
+    cd "$path"
+    pwd
+
+    #Set default mime type
+    if [ -n "$MIME_TYPE" ]; then
+        xdg-mime default "$DEB_PACKAGE_NAME".desktop "$MIME_TYPE"
+    fi
+
+    env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" &
+}
+
+CallQQGameV2()
+{
+    debug_log "run $1"
+    $SHELL_DIR/kill.sh QQMicroGameBox block
+    env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$1" -action:force_download -appid:${2} -pid:8 -bin_version:1.1.2.4 -loginuin: &
+}
+
+CallPsCs6()
+{
+    #get file full path
+    path="$1"
+    path=$(echo ${path/c:/${WINEPREFIX}/drive_c})
+    path=$(echo ${path//\\/\/})
+
+    #kill bloack process
+    name="${path##*/}"
+    $SHELL_DIR/kill.sh "$name" block
+
+    #change current dir to excute path
+    path=$(dirname "$path")
+    cd "$path"
+    pwd
+
+    #Set default mime type
+    if [ -n "$MIME_TYPE" ]; then
+        xdg-mime default "$DEB_PACKAGE_NAME".desktop "$MIME_TYPE"
+    fi
+
+    debug_log_to_file "Starting process $* ..."
+
+    env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" &
+}
+
+#arg 1: exec file path
+#arg 2: autostart ,or exec arg 1
+#arg 3: exec arg 2
+CallApp()
+{
+    FixLink
+    debug_log "CallApp $BOTTLENAME arg count $#: $*"
+
+    case $BOTTLENAME in
+        "Deepin-WangWang")
+            CallWangWang "$@"
+            ;;
+        "Deepin-ZhuMu")
+            CallZhuMu "$@"
+            ;;
+        "Deepin-QQ")
+            CallQQ "$@"
+            ;;
+        "Deepin-TIM")
+            CallTIM "$@"
+            ;;
+        "Deepin-QQGame"*)
+            CallQQGame "$@"
+            ;;
+        "Deepin-ATM")
+            CallATM "$@"
+            ;;
+        "Deepin-WeChat")
+            CallWeChat "$@"
+            ;;
+        "Deepin-WXWork")
+            CallWXWork "$@"
+            ;;
+        "Deepin-Dding")
+            CallDingTalk "$@"
+            ;;
+        "Deepin-MTXX")
+            CallMeiTuXiuXiu "$@"
+            ;;
+        "Deepin-FastReadPDF")
+            CallFastReadPDF "$@"
+            ;;
+        "Deepin-Evernote")
+            CallEvernote "$@"
+            ;;
+        "Deepin-TencentVideo")
+            CallTencentVideo "$@"
+            ;;
+        "Deepin-Foxmail")
+            CallFoxmail "$@"
+            ;;
+        "Deepin-THS")
+            CallTHS "$@"
+            ;;
+        "Deepin-QQHlddz")
+            CallQQGameV2 "$1" 363
+            ;;
+        "Deepin-QQBydr")
+            CallQQGameV2 "$1" 1104632801
+            ;;
+        "Deepin-QQMnsj")
+            CallQQGameV2 "$1" 1105856612
+            ;;
+        "Deepin-QQSszb")
+            CallQQGameV2 "$1" 1105640244
+            ;;
+        "Deepin-CS6")
+            CallPsCs6 "$@"
+            ;;
+        *)
+            CallProcess "$@"
+            ;;
+    esac
+}
+ExtractApp()
+{
+	mkdir -p "$1"
+	7z x "$APPDIR/$APPTAR" -o"$1"
+	mv "$1/drive_c/users/@current_user@" "$1/drive_c/users/$USER"
+	sed -i "s#@current_user@#$USER#" $1/*.reg
+    FixLink
+}
+DeployApp()
+{
+	ExtractApp "$WINEPREFIX"
+
+    if UsePublicDir;then
+        chgrp -R users "$WINEPREFIX"
+        chmod -R 0775 "$WINEPREFIX"
+    fi
+
+	echo "$APPVER" > "$WINEPREFIX/PACKAGE_VERSION"
+}
+RemoveApp()
+{
+	rm -rf "$WINEPREFIX"
+}
+ResetApp()
+{
+	debug_log "Reset $PACKAGENAME....."
+	read -p "*	Are you sure?(Y/N)" ANSWER
+	if [ "$ANSWER" = "Y" -o "$ANSWER" = "y" -o -z "$ANSWER" ]; then
+		EvacuateApp
+		DeployApp
+		CallApp
+	fi
+}
+UpdateApp()
+{
+	if [ -f "$WINEPREFIX/PACKAGE_VERSION" ] && [ "$(cat "$WINEPREFIX/PACKAGE_VERSION")" = "$APPVER" ]; then
+		return
+	fi
+	if [ -d "${WINEPREFIX}.tmpdir" ]; then
+		rm -rf "${WINEPREFIX}.tmpdir"
+	fi
+
+    case $BOTTLENAME in
+        "Deepin-Intelligent" | "Deepin-QQ" | "Deepin-TIM" | "Deepin-WeChat" | "Deepin-WXWork" | "Deepin-Dding")
+            rm -rf "$WINEPREFIX"
+            DeployApp
+            return
+            ;;
+    esac
+
+	ExtractApp "${WINEPREFIX}.tmpdir"
+	$SHELL_DIR/updater -s "${WINEPREFIX}.tmpdir" -c "${WINEPREFIX}" -v
+
+    if UsePublicDir;then
+        chgrp -R users "$WINEPREFIX"
+        chmod -R 0775 "$WINEPREFIX"
+    fi
+
+	rm -rf "${WINEPREFIX}.tmpdir"
+	echo "$APPVER" > "$WINEPREFIX/PACKAGE_VERSION"
+}
+RunApp()
+{
+    progpid=$(ps -ef | grep "zenity --progress --title=${BOTTLENAME}" | grep -v grep)
+    debug_log "run ${BOTTLENAME} progress pid $progpid"
+    if [ -n "$progpid" ]; then
+        debug_log "$BOTTLENAME is running"
+        exit 0
+    fi
+ 	if [ -d "$WINEPREFIX" ]; then
+        UpdateApp | progressbar "$BOTTLENAME" "更新$BOTTLENAME中..."
+ 	else
+        DeployApp | progressbar $BOTTLENAME "初始化$BOTTLENAME中..."
+ 	fi
+    CallApp "$@"
+}
+
+CreateBottle()
+{
+    if [ -d "$WINEPREFIX" ]; then
+        UpdateApp
+    else
+        DeployApp
+    fi
+}
+
+ParseArgs()
+{
+    if [ $# -eq 4 ];then
+	    RunApp "$3"
+    elif [ $# -eq 5 ];then
+	    RunApp "$3" "$5"
+    else
+	    RunApp "$3" "$5" "$6"
+    fi
+}
+
+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
+
+if [ $# -lt 3 ]; then
+    debug_log "参数个数小于3个"
+    exit 0
+fi
+
+BOTTLENAME="$1"
+WINEPREFIX="$HOME/.deepinwine/$1"
+
+if UsePublicDir;then
+    WINEPREFIX="$PUBLIC_DIR/$1"
+fi
+
+APPDIR="/opt/apps/${DEB_PACKAGE_NAME}/files"
+if [ -f "$APPDIR/files.md5sum" ];then
+    APPVER="$(cat $APPDIR/files.md5sum)"
+else
+    APPVER="$2"
+fi
+
+debug_log "Run $*"
+
+#执行lnk文件通过判断第5个参数是否是“/Unix”来判断
+if [ "$4" == "/Unix" ];then
+    RunApp "$3" "$4" "$5"
+    exit 0
+fi
+
+if [ $# -lt 4 ]; then
+	RunApp "$3"
+	exit 0
+fi
+case $4 in
+	"-r" | "--reset")
+		ResetApp
+		;;
+	"-c" | "--create")
+		CreateBottle
+		;;
+	"-e" | "--remove")
+		RemoveApp
+		;;
+	"-u" | "--uri")
+        ParseArgs "$@"
+		;;
+	"-f" | "--file")
+        ParseArgs "$@"
+		;;
+	"-h" | "--help")
+		HelpApp
+		;;
+	*)
+		echo "Invalid option: $4"
+		echo "Use -h|--help to get help"
+		exit 1
+		;;
+esac
+exit 0

spark-dwine-helper/build.sh

@@ -0,0 +1,133 @@
+#/bin/bash
+DEPEND=`dpkg -l | grep   fakeroot`
+if [ "$DEPEND" = "" ] ; then 
+echo "未安装依赖：fakeroot 本脚本退出"
+exit 1
+fi
+
+if [ $# -lt 1 ]; then
+echo "无参数，无法启动。用法 $0 版本号"
+echo "No option detected, exit. Usage: $0 version"
+exit 1
+fi
+
+version="$1"
+######################################################
+echo "build debian package"
+mkdir -p  pkg/DEBIAN
+cp -r ./s-wine-helper pkg/opt
+SIZE=`du -s ./pkg`
+SIZE=`echo ${SIZE%%.*}`
+
+cat  << EOF >pkg/DEBIAN/control
+Package: spark-dwine-helper
+Version: $version
+Architecture: all
+Maintainer: shenmo <shenmo@spark-app.store>
+Installed-Size: $SIZE
+Depends: zenity:amd64, p7zip-full:amd64, fonts-noto-cjk,deepin-wine-helper(>=5.1)
+Section: utils
+Priority: extra
+Recommends: spark-dwine-helper-settings
+Multi-Arch: foreign
+Replaces: store.spark-app.spark-dwine-helper(<=$version)
+Homepage: https://gitee.com/deepin-community-store/spark-wine
+Description: Spark Deepin Wine Helper
+
+
+EOF
+
+cp postrm pkg/DEBIAN/postrm
+
+
+chmod +x pkg/DEBIAN/postrm
+
+cd pkg && fakeroot dpkg-deb -Z xz -b . ../
+cd ..
+
+echo "普通deb包已经准备好，正在生成UOS deb包"
+rm -rf pkg/
+#################################################################
+mkdir -p pkg/DEBIAN
+cp -r uos-package-assets/opt pkg/
+cp -r s-wine-helper/* pkg/opt
+
+cat  << EOF >pkg/opt/apps/store.spark-app.spark-dwine-helper/info
+{
+    "appid": "store.spark-app.spark-dwine-helper",
+    "name": "store.spark-app.spark-dwine-helper",
+    "version": "$version",
+    "arch": ["amd64,arm64,mipsel64,sw64"],
+    "permissions": {
+        "autostart": false,
+        "notification": false,
+        "trayicon": false,
+        "clipboard": false,
+        "account": false,
+        "bluetooth": false,
+        "camera": false,
+        "audio_record": false,
+        "installed_apps": false
+    }
+}
+
+
+
+EOF
+
+SIZE=`du -s ./pkg`
+SIZE=`echo ${SIZE%%.*}`
+
+cat  << EOF >pkg/DEBIAN/control
+Package: store.spark-app.spark-dwine-helper
+Version: $version
+Architecture: all
+Maintainer: shenmo <shenmo@spark-app.store>
+Installed-Size: $SIZE
+Depends: zenity:amd64, p7zip-full:amd64, fonts-noto-cjk,deepin-wine-helper(>=5.1)
+Section: utils
+Priority: extra
+Recommends: spark-dwine-helper-settings
+Provides: spark-dwine-helper(=$version)
+Conflicts: spark-dwine-helper
+Replaces: spark-dwine-helper(<=$version)
+Multi-Arch: foreign
+Homepage: https://gitee.com/deepin-community-store/spark-wine
+Description: Spark Deepin Wine Helper
+
+
+
+EOF
+cd pkg && fakeroot dpkg-deb -Z xz -b . ../
+cd ..
+
+echo "UOS deb包已经准备好"
+rm -rf pkg/
+########################################
+mkdir -p pkg/DEBIAN
+cp -r spark-dwine-helper-settings/* pkg/
+SIZE=`du -s ./pkg`
+SIZE=`echo ${SIZE%%.*}`
+
+cat  << EOF >pkg/DEBIAN/control
+Package: spark-dwine-helper-settings
+Version: 1.1
+Architecture: all
+Maintainer: shenmo <shenmo@spark-app.store>
+Installed-Size: $SIZE
+Depends: spark-dwine-helper(>=1.6)
+Section: utils
+Priority: extra
+Multi-Arch: foreign
+Homepage: https://gitee.com/deepin-community-store/spark-wine
+Description: Spark Deepin Wine Helper
+
+
+
+EOF
+
+cd pkg && fakeroot dpkg-deb -Z xz -b . ../
+cd ..
+
+echo "helper deb包已经准备好"
+rm -rf pkg/

spark-dwine-helper/pkg/DEBIAN/control

@@ -1,11 +0,0 @@
-Package: spark-dwine-helper
-Version: 1.2
-Architecture: all
-Maintainer: shenmo <shenmo@spark-app.store>
-Installed-Size: 2293
-Depends: zenity:amd64, p7zip-full:amd64, fonts-noto-cjk,deepin-wine-helper(>=5.1)
-Section: utils
-Priority: extra
-Multi-Arch: foreign
-Homepage: https://www.spark-app.store/
-Description: Spark Deepin Wine Helper

spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/set-dwine-scale.sh

@@ -1,128 +0,0 @@
-#!/bin/bash
-
-help() {
-    cat <<EOF
-用法：$0 [-h|--help] [-s|--set-scale-factor] path
--h|--help               显示这个帮助
--s|--set-scale-factor   直接指定缩放。支持1.0，1.25，1.5，2.0	
-path                    容器目录
-
-
---------------------------------------------------------------------
-Usage: $0 [-h|--help] [-s|--set-scale-factor] path
--h|--help               Show this text
--s|--set-scale-factor   Set scale factor direcly. Support 1.0，1.25，1.5，2.0	
-path                    Wine Container directory path
-
-
-EOF
-}
-#########################帮助文件结束#############################
-
-parse_args() {
-    while [ $# -gt 0 ]; do
-        case "$1" in
-        -h|--help)
-            help
-            exit
-            ;;
-	-s|--set-scale-factor)
-	scale_factor="$2"
-	;;
-        *)
-            CONTAINER_PATH="$1"
-
-            ;;
-    esac
-    shift
-    done
-}
-################
-parse_args "$@"
-
-
-#####先看看PATH对不对
-if [ ! -f "$CONTAINER_PATH/user.reg" ];then
-	echo "错误：找不到user.reg，退出。你应当在文件解压结束后调用此脚本"
-    echo "E: Can not find user.reg. Exit. You should use this script after the extraction"
-	exit 1
-fi
-
-
-if [ "$scale_factor" = "" ];then
-#########未指定下
-until [ "$env_dwine_scale" != "" ];do
-
-env_dwine_scale=`echo $DEEPIN_WINE_SCALE`
-if [ "$env_dwine_scale" = "" ];then
-echo "E: No DEEPIN_WINE_SCALE found. Use spark-get-scale to Set "
-echo "错误：没有检测到DEEPIN_WINE_SCALE，用spark-get-scale设置"
-/opt/durapps/spark-dwine-helper/spark-get-scale.sh 
-env_dwine_scale=`cat ~/.config/spark-wine/scale.txt`
-echo "检测到的缩放倍数为:$env_dwine_scale"
-echo "Scale is $env_dwine_scale"
-
-else
-echo "检测到的缩放倍数为:$env_dwine_scale"
-echo "Scale is $env_dwine_scale"
-fi
-
-done
-#####非deepin发行版似乎没有这个变量，暂时不清楚这个变量是哪个组件做的
-
-else
-#######指定了缩放倍数
-echo "使用了--set-scale-factor，直接指定"
-echo "--set-scale-factor detected. Arrange directly"
-
-
-if [ "$scale_factor" != "1.0" ] && [ "$scale_factor" != "1.25" ] && [ "$scale_factor" != "1.5" ]  && [ "$scale_factor" != "2.0" ] ;then
-echo "无法识别的倍数：$scale_factor，请参看$0 -h"
-echo "Unrecognizable number. Use $0 -h to get help"
-exit 1
-fi
-#######没问题了再用
-env_dwine_scale=`echo $scale_factor`
-
-
-fi
-
-########开始设置
-case "$env_dwine_scale" in
-       1.0)
-            reg_text="\"LogPixels\"=dword:00000060"
-            ;;
-        1.25)
-            reg_text="\"LogPixels\"=dword:00000078"
-            ;;
-        1.5)
-            reg_text="\"LogPixels\"=dword:00000090"
-            ;;
-        2.0)
-            reg_text="\"LogPixels\"=dword:000000C0"
-            ;;
-	*)
-		reg_text="\"LogPixels\"=dword:00000060"
-		#可能不是Xorg
-		;;
-    esac
-
-#####根据scale设置dword值
-
-
-LogPixels_line=(`sed -n -e "/"LogPixels"/=" $CONTAINER_PATH/user.reg`)
-#####关键词行数取得
-until [ "${#LogPixels_line[@]}" = "0" ];do
-
-
-line_num=${LogPixels_line[0]}
-
-sed -i "$line_num"c\ "$reg_text" "$CONTAINER_PATH/user.reg"
-LogPixels_line=(${LogPixels_line[@]:1})
-done
-
-echo "已经完成替换。位置：$CONTAINER_PATH/user.reg"
-echo "在以下行数进行了替换，内容为$reg_text"
-echo `sed -n -e "/"LogPixels"/=" $CONTAINER_PATH/user.reg`
-echo "---------------------------------------"
-

spark-dwine-helper/pkg/opt/durapps/spark-dwine-helper/spark-get-scale.sh

@@ -1,48 +0,0 @@
-#/bin/bash
-
-mkdir -p ~/.config/spark-wine/
-
-
-Get_Dist_Name()
-{
-    if grep -Eqii "Deepin" /etc/issue || grep -Eq "Deepin" /etc/*-release; then
-        DISTRO='Deepin'
-    elif grep -Eqi "Uniontech" /etc/issue || grep -Eq "Uniontech" /etc/*-release; then
-        DISTRO='UniontechOS'
-
-	fi
-}
-Get_Dist_Name
-if [ "$DISTRO" = "Deepin" ] || [ "$DISTRO" = "UniontechOS" ];then
-echo 1.0 > ~/.config/spark-wine/scale.txt
-#####就是1倍缩放
-exit
-fi
-
-if [ -f "~/.config/spark-wine/scale.txt" ];then
-echo "设置过了，直接读"
-exit
-fi
-
-dimensions=`xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+x[0-9]+).*$/\1/'`
-scale_factor=`zenity --list \
-	--width=700 \
-	--height=300 \
-       --title="您的分辨率是：$dimensions，请在以下选项中选择一个以运行应用" \
-       --column="缩放倍率" \
-       1.0 \
-       1.25 \
-	1.5 \
-       2.0`
-
-case "$scale_factor" in 
-	"")
-	zenity --info --text="默认为1倍缩放。您可以随时删除~/.config/spark-wine/scale.txt来重新设置"
-	scale_factor="1.0"
-	;;
-	*)
-zenity --info --text="缩放倍数为$scale_factor。已保存！您可以随时删除~/.config/spark-wine/scale.txt来重新设置" --width=500 --height=150
-	;;
-esac
-echo "$scale_factor" > ~/.config/spark-wine/scale.txt
-

spark-dwine-helper/postrm

@@ -0,0 +1,14 @@
+if [ "$1" = "remove" ] || [ "$1" = "purge" ];then
+
+echo "清理卸载残留"
+for username in $(ls /home)  
+    do
+      echo /home/$username
+        if [ -d /home/$username/.config/spark-wine ]  
+        then
+        rm -rf /home/$username/.config/spark-wine
+        fi
+    done
+else
+echo "非卸载，跳过清理"
+fi

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

@@ -7,8 +7,7 @@
 #               Peng Hao <penghao@linuxdeepin.com>
 #
 #   Modifier:   shenmo <shenmo@spark-app.store>
-#		   sgb76 <sgb76@163.com >
-#   diff: Now will run set-dwine-scale.sh in stage RunApp before CallApp
+#		   
 #
 WINEPREFIX="$HOME/.deepinwine/@public_bottle_name@"
 APPDIR="/opt/deepinwine/apps/@public_bottle_name@"
@@ -16,6 +15,7 @@ APPVER="@deb_version_string@"
 APPTAR="files.7z"
 BOTTLENAME=""
 WINE_CMD="deepin-wine"
+#这里会被后续覆盖，似乎没啥用
 LOG_FILE=$0
 PUBLIC_DIR="/var/public"
 
@@ -33,37 +33,13 @@ if [ $SPECIFY_SHELL_DIR ]; then
     SHELL_DIR=$SPECIFY_SHELL_DIR
 fi
 
-UsePublicDir()
-{
-    if [ -z "$USE_PUBLIC_DIR" ]; then
-        echo "Don't use public dir"
-        return 1
-    fi
-    if [ ! -d "$PUBLIC_DIR" ];then
-        echo "Not found $PUBLIC_DIR"
-        return 1
-    fi
-    if [ ! -r "$PUBLIC_DIR" ];then
-        echo "Can't read for $PUBLIC_DIR"
-        return 1
-    fi
-    if [ ! -w "$PUBLIC_DIR" ];then
-        echo "Can't write for $PUBLIC_DIR"
-        return 1
-    fi
-    if [ ! -x "$PUBLIC_DIR" ];then
-        echo "Can't excute for $PUBLIC_DIR"
-        return 1
-    fi
 
-    return 0
-}
 
 _DeleteRegistry()
 {
     env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg DELETE "$1" /f &> /dev/null
 }
-
+#########功能：删除注册表
 init_log_file()
 {
     if [ ! -d "$DEBUG_LOG" ];then
@@ -89,7 +65,7 @@ debug_log()
 {
     echo "${1}"
 }
-
+################log相关功能
 HelpApp()
 {
 	echo " Extra Commands:"
@@ -97,7 +73,7 @@ HelpApp()
 	echo " -e/--remove    Remove deployed app files"
 	echo " -h/--help      Show program help info"
 }
-
+#############帮助文件
 FixLink()
 {
     if [ -d ${WINEPREFIX} ]; then
@@ -111,7 +87,7 @@ FixLink()
         ls -l "${WINEPREFIX}/dosdevices"
     fi
 }
-
+###########会在应用启动和解压时执行，驱动器绑定
 DisableWrite()
 {
     if [ -d "${1}" ]; then
@@ -122,7 +98,7 @@ DisableWrite()
     mkdir "${1}"
     chmod -w "${1}"
 }
-
+########如果有该文件夹则删除，然后再创建一个不允许写入的（这东西是被用在了QQ启动上，看来腾讯不怎么好对付）
 is_autostart()
 {
     AUTOSTART="/opt/deepinwine/tools/autostart"
@@ -137,6 +113,9 @@ is_autostart()
 
     return 1
 }
+#########自动启动相关，等用到了再研究
+urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; }
+#######url转义
 
 #arg 1: windows process file path
 #arg 2-*: windows process args
@@ -165,7 +144,8 @@ CallProcess()
     fi
 
     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 "$@" &
 
     #start autobottle
@@ -173,6 +153,37 @@ CallProcess()
         $SHELL_DIR/autostart_wine.sh $DEB_PACKAGE_NAME
     fi
 }
+###通用启动APP逻辑。对于没有被case捕捉的非适配APP，则直接执行此部分。似乎已经有了防止残留的功能
+###一些自定义的应用不会使用这个启动，而另一些则会调用这个
+###有设置mimetype和自动启动(这个暂时没分析)的功能
+
+###########专属优化段：
+CallDouyin()
+{
+    if [ -f "${WINEPREFIX}/drive_c/users/${USER}/Application Data/douyin" ]; then
+       rm "${WINEPREFIX}/drive_c/users/${USER}/Application Data/douyin"
+       mv ${WINEPREFIX}/drive_c/users/${USER}/Application\ Data/*.tmp ${WINEPREFIX}/drive_c/users/${USER}/Application\ Data/douyin
+       chmod 755 ${WINEPREFIX}/drive_c/users/${USER}/Application Data/douyin
+    fi
+    CallProcess "$@"
+}
+
+CallMuBu()
+{
+    if [ -f "${WINEPREFIX}/drive_c/ProgramData/Microsoft/Windows/Start Menu/Programs/MuBu.lnk" ]; then
+       chmod 555 ${WINEPREFIX}/drive_c/ProgramData/Microsoft/Windows/Start Menu/Programs/MuBu.lnk
+    fi
+    CallProcess "$@"
+}
+
+CallFlyele() 
+{
+    if [ -w ${WINEPREFIX}/drive_c/users/${USER}/Application\ Data/飞项/Crashpad/reports ]; then
+       rm -rf ${WINEPREFIX}/drive_c/users/${USER}/Application\ Data/飞项/Crashpad/reports/*
+       chmod 555 ${WINEPREFIX}/drive_c/users/${USER}/Application\ Data/飞项/Crashpad/reports
+    fi
+    CallProcess "$@"
+}
 
 CallZhuMu()
 {
@@ -229,12 +240,15 @@ CallQQ()
     CallProcess "$@"
 }
 
+
 CallTIM()
 {
     if [ ! -f "$WINEPREFIX/../.QQ_run" ]; then
         debug_log "first run time"
         $SHELL_DIR/add_hotkeys
+####似乎是给dde-control-center添加快捷键
         $SHELL_DIR/fontconfig
+####暂时无法得知用途和用法
         # If the bottle not exists, run reg may cost lots of times
         # So create the bottle befor run reg
         env WINEPREFIX="$WINEPREFIX" $WINE_CMD uninstaller --list
@@ -286,15 +300,19 @@ CallDingTalk()
     CallProcess "$@"
 }
 
-urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; }
+
 
 CallMeiTuXiuXiu()
 {
     #set -- "$1" "${2#file://*}"
     local path=$(urldecode "$2")
     path=${path/file:\/\//}
-    set -- "$1" $path
+    set -- "$1" "$path"
+	if [ "$path" ];then 
     CallProcess "$@"
+	else
+	CallProcess "$1"
+	fi
 }
 
 CallFastReadPDF()
@@ -302,16 +320,25 @@ CallFastReadPDF()
     #set -- "$1" "${2#file://*}"
     local path=$(urldecode "$2")
     path=${path/file:\/\//}
-    set -- "$1" $path
+    set -- "$1" "$path"
+	if [ "$path" ];then 
     CallProcess "$@"
+	else
+	CallProcess "$1"
+	fi
 }
 
 CallEvernote()
 {
+    #set -- "$1" "${2#file://*}"
     local path=$(urldecode "$2")
     path=${path/file:\/\//}
-    set -- "$1" $path
+    set -- "$1" "$path"
+	if [ "$path" ];then 
     CallProcess "$@"
+	else
+	CallProcess "$1"
+	fi
 }
 
 CallTencentVideo()
@@ -353,14 +380,14 @@ CallTHS()
         xdg-mime default "$DEB_PACKAGE_NAME".desktop "$MIME_TYPE"
     fi
 
-    env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" &
+    CallProcess "$@"
 }
 
 CallQQGameV2()
 {
     debug_log "run $1"
     $SHELL_DIR/kill.sh QQMicroGameBox block
-    env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$1" -action:force_download -appid:${2} -pid:8 -bin_version:1.1.2.4 -loginuin: &
+    CallProcess "$1" -action:force_download -appid:${2} -pid:8 -bin_version:1.1.2.4 -loginuin: 
 }
 
 CallPsCs6()
@@ -386,12 +413,17 @@ CallPsCs6()
 
     debug_log_to_file "Starting process $* ..."
 
-    env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$@" &
+    CallProcess "$@"
 }
 
+#####专属优化段结束
+
 #arg 1: exec file path
 #arg 2: autostart ,or exec arg 1
 #arg 3: exec arg 2
+
+
+#### CallApp段，根据容器名找专属优化，没有就走通用启动
 CallApp()
 {
     FixLink
@@ -404,7 +436,7 @@ CallApp()
         "Deepin-ZhuMu")
             CallZhuMu "$@"
             ;;
-        "Deepin-QQ")
+        "Deepin-QQ"|"Wine-QQ"|"Spark-QQ")
             CallQQ "$@"
             ;;
         "Deepin-TIM")
@@ -419,7 +451,7 @@ CallApp()
         "Deepin-WeChat")
             CallWeChat "$@"
             ;;
-        "Deepin-WXWork")
+        "Deepin-WXWork"|"Spark-WeCom")
             CallWXWork "$@"
             ;;
         "Deepin-Dding")
@@ -458,6 +490,15 @@ CallApp()
         "Deepin-CS6")
             CallPsCs6 "$@"
             ;;
+        "Spark-MuBu")
+            CallMuBu "$@"
+            ;;
+        "Spark-flyele")
+            CallFlyele "$@"
+            ;;
+	    "Spark-douyin")
+            CallDouyin "$@"
+            ;;
         *)
             CallProcess "$@"
             ;;
@@ -475,10 +516,6 @@ DeployApp()
 {
 	ExtractApp "$WINEPREFIX"
 
-    if UsePublicDir;then
-        chgrp -R users "$WINEPREFIX"
-        chmod -R 0775 "$WINEPREFIX"
-    fi
 
 	echo "$APPVER" > "$WINEPREFIX/PACKAGE_VERSION"
 
@@ -507,7 +544,7 @@ UpdateApp()
 	fi
 
     case $BOTTLENAME in
-        "Deepin-Intelligent" | "Deepin-QQ" | "Deepin-TIM" | "Deepin-WeChat" | "Deepin-WXWork" | "Deepin-Dding")
+        "Deepin-Intelligent" | "Deepin-QQ" | "Deepin-TIM" | "Deepin-WeChat" | "Deepin-WXWork" | "Deepin-Dding" | "Wine-QQ" | "Spark-QQ" | "Spark-weixin")
             rm -rf "$WINEPREFIX"
             DeployApp
             return
@@ -517,10 +554,6 @@ UpdateApp()
 	ExtractApp "${WINEPREFIX}.tmpdir"
 	$SHELL_DIR/updater -s "${WINEPREFIX}.tmpdir" -c "${WINEPREFIX}" -v
 
-    if UsePublicDir;then
-        chgrp -R users "$WINEPREFIX"
-        chmod -R 0775 "$WINEPREFIX"
-    fi
 
 	rm -rf "${WINEPREFIX}.tmpdir"
 	echo "$APPVER" > "$WINEPREFIX/PACKAGE_VERSION"
@@ -538,8 +571,6 @@ RunApp()
  	else
         DeployApp | progressbar $BOTTLENAME "初始化$BOTTLENAME中..."
  	fi
-#############  WARNING: Here is the modified content: Now will run set-dwine-scale.sh
-	/opt/durapps/spark-dwine-helper/set-dwine-scale.sh "$WINEPREFIX"
 
     CallApp "$@"
 }
@@ -581,6 +612,8 @@ else
 	}
 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/
 if [ $# -lt 3 ]; then
     debug_log "参数个数小于3个"
     exit 0
@@ -589,9 +622,6 @@ fi
 BOTTLENAME="$1"
 WINEPREFIX="$HOME/.deepinwine/$1"
 
-if UsePublicDir;then
-    WINEPREFIX="$PUBLIC_DIR/$1"
-fi
 
 APPDIR="/opt/apps/${DEB_PACKAGE_NAME}/files"
 if [ -f "$APPDIR/files.md5sum" ];then

spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/scale-set-helper/bunny.txt

@@ -0,0 +1,92 @@
+ ___                                                  
+(   )                                                 
+ | | .-.    ___  ___    .--.     .--.                 
+ | |/   \  (   )(   )  /    \   /    \                
+ |  .-. .   | |  | |  ;  ,-. ' |  .-. ;               
+ | |  | |   | |  | |  | |  | | |  | | |               
+ | |  | |   | |  | |  | |  | | |  |/  |               
+ | |  | |   | |  | |  | |  | | |  ' _.'               
+ | |  | |   | |  ; '  | '  | | |  .'.-.               
+ | |  | |   ' `-'  /  '  `-' | '  `-' /               
+(___)(___)   '.__.'    `.__. |  `.__.'                
+                       ( `-' ;                        
+                        `.__.                         
+ ___                                                  
+(   )                                                 
+ | |.-.     .---.   ___ .-.      .--.    ___ .-.      
+ | /   \   / .-, \ (   )   \    /    \  (   )   \     
+ |  .-. | (__) ; |  | ' .-. ;  |  .-. ;  |  .-. .     
+ | |  | |   .'`  |  |  / (___) | |  | |  | |  | |     
+ | |  | |  / .'| |  | |        | |  | |  | |  | |     
+ | |  | | | /  | |  | |        | |  | |  | |  | |     
+ | '  | | ; |  ; |  | |        | '  | |  | |  | |     
+ ' `-' ;  ' `-'  |  | |        '  `-' /  | |  | |     
+  `.__.   `.__.'_. (___)        `.__.'  (___)(___)    
+                                                      
+                                                      
+ ___                                                  
+(   )                                                 
+ | |.-.    ___  ___   ___ .-.    ___ .-.    ___  ___  
+ | /   \  (   )(   ) (   )   \  (   )   \  (   )(   ) 
+ |  .-. |  | |  | |   |  .-. .   |  .-. .   | |  | |  
+ | |  | |  | |  | |   | |  | |   | |  | |   | |  | |  
+ | |  | |  | |  | |   | |  | |   | |  | |   | '  | |  
+ | |  | |  | |  | |   | |  | |   | |  | |   '  `-' |  
+ | '  | |  | |  ; '   | |  | |   | |  | |    `.__. |  
+ ' `-' ;   ' `-'  /   | |  | |   | |  | |    ___ | |  
+  `.__.     '.__.'   (___)(___) (___)(___)  (   )' |  
+                                             ; `-' '  
+                                              .__.'   
+    ............                .....]OOOo]`....           
+    ... ........                ...=OOOOOOOOO\..           
+    .../OOOOOOO`....            ..=OOO@/[\OOOOO.           
+    ..=OOOOOOOOO\...            .,@OO^/....O@O@`           
+    ..OOOOOO[[OOO@`.            .=OO@,...=.OOOO.           
+    ..OOOOO./O^,@OO`            .=OO^....,.@OO^.           
+    ..\OOO@^...=OOOO....        .OOO^*..,`/OOO..           
+    ...\OOOOOOOooooO^...        .=OO^...`=OO@`..           
+      ..=@O@OooOOOOO@`...........=@@O]].,@O@`...           
+        .,@OoOO`...O@^......,]]]]/OOOOOOO@@... .           
+        ...\OO@]]]OOOO@@@@@@@@@@@@@@@@@@@OO.....           
+        .....[@@OOO@@@@@@@@@@@@@@@@@@@@@@@@@@`..           
+            ..OOO@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@`....       
+            .,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\...       
+        ....=@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@^..       
+        ...=@@@@@@@@@@@@@@@@@@@@@@`,\@@@@@@@@@@@@@^.       
+        ..,@@@@@@@@@@@@@@@@@@@@@@@O,[].\@@@@@@@@@@@.       
+        ../@@@@@@@@@@@@O@@@@@@@@@@@......\@@@@@@@@@^          
+        .,@@@@@@@@@@@O`.\@@@@@@@@@/........\@@@@@@@@...    
+        .=@@@@@@@@@/.....\@@@@@@@@/`...[O`..\@@@@@@@`...   
+        .=@@@@@@@^,O[..,`.,@@@@@/../@@O[`...,@@@@@@@....   
+      ....@@@@@@@O`,@@O[]..,@/[`..=oo@O`,^...@@@@@@@@`..   
+    ....O@@@@@@@@`,OOO@^*\.........\..../.../@`.=^..       
+    .. ...,@^=@@@^.\`...,^...........[[......O]//...       
+          ..,\]@@@\...[`....................=@@/....       
+            .=@@\............,]/`........../@@@\.. .       
+        .....@@@@@\.....................,/@@@@@@\...       
+         ...=@@@@@@@@\]..............]@@@@@@@@@@@@`.       
+        ...,@@@@@@@@@@@@@@/[\O@@O/[*./@@@@@@@@@@@@@\.......
+        ...@@@@@@@@@@@@@@@^.,O@@@@^../@@@@@@@@@@@@@@@\.....
+..........@@@@@@@@@@@@@@@@@`..`\/`../@@@@@@@@@@@@@@@@@@@@]]
+........,@@@@@@@@@@@@@@@@/*[\].,`]/[[@@@@@@@@@@@@@@,[[[[`..
+..,O\/@@@@@@@@@@@@@@@@@@@`...........O@@O@@@@@@@@@@\....   
+.....\@@@@@@@@@@@@@@@@@@@OO\`,O..   .,@OOO@@@@@@@@@@. ..   
+    ..../@@@@@@@@@@@@@@OO@`.^,O.    ..=@OOO@@@@@@@@@.. .   
+    ...=@@@@@@@@@@@@@@@@@O[[....    ...\@@@@@@@@@@@/.. .   
+    ...=@@@@@@@@@@@@@@,^            ....O...\@@@@@@`       
+    ....@@@@@@@@@@@@@/..            ...^/\]/[\@@@@`.       
+        .@@@@/@@@@@@@^O.....        ...,@@^]..]@/...       
+        ...\@`.[@@@@@@......        .=`@@@@@^..^....       
+        ....`....[@@@O\.[,..........OO@@@@@^.,[[....       
+        ............\@@@\`...,`**,]@@@@@@@^.........       
+..                  .,@@@@@@@@@@@@@@@@@@/...               
+                    ..O@@@@@@@@@@@@@@@@@^...               
+                    ..O@@@@@@^...=@@@@@@@...               
+                    ..@@@@@@@\...=@@@@@@@^..               
+                    .=@@@@@@@@...=@@@@@@@O..               
+                    .=@@@@@@@@`..=@@@@@@@@..               
+                    .=@@@O@@@@^..=@@OO@@@@^.               
+                    .O@OOOOO@O^..=@OOOOOOO^.               
+                    .Oo/[\O/\O@..=/[\O/\o*O.               
+                    .O^......=O...^......*/.               
+                    .=\.....]O^...\\...]//..    .. ........

spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/scale-set-helper/get-scale.sh

@@ -0,0 +1,77 @@
+#/bin/bash
+#########>>>>>>>函数段
+Get_Dist_Name()
+{
+    if grep -Eqii "Deepin" /etc/issue || grep -Eq "Deepin" /etc/*-release; then
+        DISTRO='Deepin'
+    elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then
+        DISTRO='UniontechOS'
+    else
+	 DISTRO='OtherOS'
+	fi
+}
+#########<<<<<<<
+
+if [ $# -lt 1 ]; then
+echo "无参数，无法启动。这是一个set-wine-scale的组件，一般来说，你不会需要单独启动这个脚本"
+echo "请参考set-wine-scale.sh使用"
+echo "参数为CONTAINER_PATH"
+echo "只读取第一个，其他参数会被放弃"
+fi
+
+CONTAINER_PATH="$1"
+
+if [ ! -f "$CONTAINER_PATH/user.reg" ];then
+	echo "错误：找不到user.reg，退出。你应当在文件解压结束后调用此脚本"
+    echo "E: Can not find user.reg. Exit. You should use this script after the extraction"
+	exit 1
+fi
+
+
+mkdir -p $HOME/.config/spark-wine/
+#####全局参数位置
+#####能到这一步的说明已经是没有自定义参数了，直接读全局覆盖没问题
+#####
+
+if [ -f "$HOME/.config/spark-wine/scale.txt" ];then
+	cat $HOME/.config/spark-wine/scale.txt > $CONTAINER_PATH/scale.txt
+	echo "检测到已经设置过全局参数，直接复制"
+    echo "全局参数的位置在$HOME/.config/spark-wine/scale.txt，如果需要更换请删除此文件重新生成"
+	exit
+fi
+
+
+Get_Dist_Name
+if [ "$DISTRO" = "Deepin" ] || [ "$DISTRO" = "UniontechOS" ];then
+echo 1.0 > $HOME/.config/spark-wine/scale.txt
+cat $HOME/.config/spark-wine/scale.txt > $CONTAINER_PATH/scale.txt
+#####就是1倍缩放
+exit
+fi
+
+
+
+dimensions=`xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+x[0-9]+).*$/\1/'`
+scale_factor=`zenity --list \
+	--width=700 \
+	--height=350 \
+       --title="您的分辨率是：$dimensions，请在以下选项中选择一个以运行应用" \
+       --column="缩放倍率" \
+       1.0 \
+       1.25 \
+	1.5 \
+	1.75 \
+       2.0`
+
+case "$scale_factor" in 
+	"")
+	zenity --info --text="默认为1倍缩放。您可以使用星火wine助手设置来重新设置" --width=500 --height=150
+	scale_factor="1.0"
+	;;
+	*)
+zenity --info --text="缩放倍数为$scale_factor。已保存！您可以使用星火wine助手设置来重新设置" --width=500 --height=150
+	;;
+esac
+echo "$scale_factor" > $HOME/.config/spark-wine/scale.txt
+cat $HOME/.config/spark-wine/scale.txt > $CONTAINER_PATH/scale.txt
+

spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh

@@ -0,0 +1,186 @@
+#!/bin/bash
+
+help() {
+    cat <<EOF
+用法：$0 [-h|--help] [-s|--set-scale-factor] path
+-h|--help               显示这个帮助
+-s|--set-scale-factor   直接指定缩放。支持1.0，1.25，1.5，1.75，2.0	
+path                    容器目录
+
+                                         本脚本具有超级兔力。
+--------------------------------------------------------------------
+Usage: $0 [-h|--help] [-s|--set-scale-factor] path
+-h|--help               Show this text
+-s|--set-scale-factor   Set scale factor direcly. Support 1.0，1.25，1.5，1.75，2.0	
+path                    Wine Container directory path
+
+                                         This script have super bunny power.
+EOF
+}
+#########################帮助文件结束#############################
+
+parse_args() {
+    while [ $# -gt 0 ]; do
+        case "$1" in
+        -h|--help)
+            help
+            exit
+            ;;
+	-s|--set-scale-factor)
+	appointed_scale_factor="$2"
+    
+	;;
+
+	"bunny")
+		cat /opt/durapps/spark-dwine-helper/scale-set-helper/bunny.txt
+	exit
+
+	;;
+
+        *)
+            CONTAINER_PATH="$1"
+
+            ;;
+    esac
+    shift
+    done
+}
+################
+parse_args "$@"
+
+#####先看看PATH对不对
+if [ ! -f "$CONTAINER_PATH/user.reg" ];then
+	echo "错误：找不到user.reg，退出。你应当在文件解压结束后调用此脚本。"
+	echo "如果你不清楚如何使用这个脚本，请使用 $0 -h"
+    echo "E: Can not find user.reg. Exit. You should use this script after the extraction"
+	echo "If you don't know how to use this script, try $0 -h"
+	exit 1
+fi
+
+
+if [ "$appointed_scale_factor" = "" ];then
+#########未指定下，读取$CONTAINER_PATH/scale.txt。如果没有，优先$DEEPIN_WINE_SCALE设置，然后是手动
+
+if [ ! -f "$CONTAINER_PATH/scale.txt" ];then
+	
+	echo "E: No SCALE profile found. try to use DEEPIN_WINE_SCALE"
+	echo "错误：没有检测到缩放设置，读取DEEPIN_WINE_SCALE"
+	if [ "$DEEPIN_WINE_SCALE" = "" ];then
+		echo "E: No DEEPIN_WINE_SCALE found. Use get-scale.sh to Set "
+		echo "错误：没有检测到DEEPIN_WINE_SCALE，用get-scale.sh设置"
+		/opt/durapps/spark-dwine-helper/scale-set-helper/get-scale.sh "$CONTAINER_PATH"
+		wine_scale=`cat $CONTAINER_PATH/scale.txt`
+		echo "检测到的缩放倍数为:$wine_scale"
+		echo "Scale is $wine_scale"
+	else
+		echo "$DEEPIN_WINE_SCALE" > $CONTAINER_PATH/scale.txt
+		wine_scale=`cat $CONTAINER_PATH/scale.txt`
+		echo "检测到的缩放倍数为:$wine_scale"
+		echo "Scale is $wine_scale"
+fi
+else
+wine_scale=`cat $CONTAINER_PATH/scale.txt`
+
+echo "检测到的缩放倍数为:$wine_scale"
+echo "Scale is $wine_scale"
+
+
+fi
+#####非deepin发行版似乎没有这个变量，暂时不清楚这个变量是哪个组件做的
+
+
+
+else
+#######指定了缩放倍数
+echo "使用了--set-scale-factor，直接指定"
+echo "--set-scale-factor detected. Arrange directly"
+
+
+if [ "$appointed_scale_factor" != "1.0" ] && [ "$appointed_scale_factor" != "1.25" ] && [ "$appointed_scale_factor" != "1.5" ]  && [ "$appointed_scale_factor" != "1.75" ] && [ "$appointed_scale_factor" != "2.0" ] ;then
+echo "无法识别的倍数：$appointed_scale_factor，请参看$0 -h"
+echo "Unrecognizable number. Use $0 -h to get help"
+exit 1
+fi
+#######没问题了再用
+echo "$appointed_scale_factor" > $CONTAINER_PATH/scale.txt
+wine_scale=`cat $CONTAINER_PATH/scale.txt`
+
+fi
+
+########开始设置
+########如果环境变量里没指定了APPRUN_CMD（在run.sh中）就替换，如果有就直接用来设置
+
+if [ "$APPRUN_CMD" = "" ];then
+echo "没有检测到APPRUN_CMD环境变量，执行sed替换。如果要使用wine原生提供的方法，请在环境变量中指定(export)"
+case "$wine_scale" in
+       1.0)
+            reg_text="\"LogPixels\"=dword:00000060"
+            ;;
+        1.25)
+            reg_text="\"LogPixels\"=dword:00000078"
+            ;;
+        1.5)
+            reg_text="\"LogPixels\"=dword:00000090"
+            ;;
+        1.75)
+            reg_text="\"LogPixels\"=dword:000000A8"
+            ;;
+        2.0)
+            reg_text="\"LogPixels\"=dword:000000C0"
+            ;;
+	*)
+		reg_text="\"LogPixels\"=dword:00000060"
+		#可能不是Xorg
+		;;
+    esac
+
+#####根据scale设置dword值
+
+
+LogPixels_line=(`sed -n -e "/"LogPixels"/=" $CONTAINER_PATH/user.reg`)
+#####关键词行数取得
+until [ "${#LogPixels_line[@]}" = "0" ];do
+
+
+line_num=${LogPixels_line[0]}
+
+sed -i "$line_num"c\ "$reg_text" "$CONTAINER_PATH/user.reg"
+LogPixels_line=(${LogPixels_line[@]:1})
+done
+
+echo "已经完成替换。位置：$CONTAINER_PATH/user.reg"
+echo "在以下行数进行了替换，内容为$reg_text"
+echo `sed -n -e "/"LogPixels"/=" $CONTAINER_PATH/user.reg`
+echo "---------------------------------------"
+
+else
+#####用wine提供的方法
+
+case "$wine_scale" in
+       1.0)
+            dpi="96"
+            ;;
+        1.25)
+            dpi="120"
+            ;;
+        1.5)
+            dpi="144"
+            ;;
+        1.75)
+            dpi="168"
+            ;;
+        2.0)
+            dpi="192"
+            ;;
+	*)
+		dpi="96"
+		#可能不是Xorg或者是其他错误
+		;;
+    esac
+echo "用$APPRUN_CMD执行指令"
+echo "指令为"
+echo "env WINEPREFIX="$CONTAINER_PATH" $APPRUN_CMD reg ADD 'HKCU\Control Panel\Desktop' /v LogPixels /t REG_DWORD /d $dpi /f"
+
+env WINEPREFIX="$CONTAINER_PATH" $APPRUN_CMD reg ADD 'HKCU\Control Panel\Desktop' /v LogPixels /t REG_DWORD /d $dpi /f
+
+fi

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

@@ -0,0 +1,102 @@
+#/bin/bash
+
+
+until [ "$IS_CLOSE" = "1" ];do
+
+CHOSEN_SETTINGS=`zenity --list \
+	--width=700 \
+	--height=350 \
+       --title="欢迎使用星火wine助手控制中心，请在以下选项中选择一个执行！" \
+       --column="操作" \
+	设置全局缩放 \
+       设置单独应用缩放 \
+	备注：以上操作仅对使用了spark-dwine-helper的应用生效 `
+
+echo "$CHOSEN_SETTINGS"
+case "$CHOSEN_SETTINGS" in 
+	"设置全局缩放")
+########
+	zenity --info --text="请注意：此选项对deepin/UOS无效，会优先读取deepin/UOS的缩放设置进行缩放" --width=500 --height=150
+
+dimensions=`xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+x[0-9]+).*$/\1/'`
+scale_factor=`zenity --list \
+	--width=700 \
+	--height=350 \
+       --title="您的分辨率是：$dimensions，请在以下选项中选择一个" \
+       --column="缩放倍率" \
+       1.0 \
+       1.25 \
+	1.5 \
+	1.75 \
+       2.0`
+
+case "$scale_factor" in 
+	"")
+	zenity --info --text="默认为1倍缩放。" --width=500 --height=150
+	scale_factor="1.0"
+	;;
+	*)
+zenity --info --text="缩放倍数为$scale_factor。已保存！" --width=500 --height=150
+	;;
+esac
+echo "$scale_factor" > $HOME/.config/spark-wine/scale.txt
+
+
+	;;
+########
+
+
+
+
+	"设置单独应用缩放")
+	zenity --info --text="请在接下来的文件选择框选中所需的应用所在的容器文件夹（注意要选择文件夹）" --width=500 --height=150
+	CONTAINER_PATH=`zenity --file-selection --filename="$HOME/.deepinwine/" --directory`
+	
+	if [ ! -f "$CONTAINER_PATH/user.reg" ];then
+	zenity --info --text="错误：找不到user.reg.这不是一个wine容器" --width=500 --height=150
+	
+	else
+	
+	dimensions=`xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+x[0-9]+).*$/\1/'`
+scale_factor=`zenity --list \
+	--width=700 \
+	--height=350 \
+       --title="您的分辨率是：$dimensions，请在以下选项中选择一个" \
+       --column="缩放倍率" \
+       1.0 \
+       1.25 \
+	1.5 \
+	1.75 \
+       2.0 \
+	与全局设置同步 `
+
+case "$scale_factor" in 
+	"")
+	zenity --info --text="默认为1倍缩放。" --width=500 --height=150
+	scale_factor="1.0"
+/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh -s $scale_factor $CONTAINER_PATH
+	;;
+	"与全局设置同步")
+	zenity --info --text="将会与全局设置同步" --width=500 --height=150
+	rm $CONTAINER_PATH/scale.txt
+	;;
+	*)
+zenity --info --text="缩放倍数为$scale_factor。已保存！" --width=500 --height=150
+/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh -s $scale_factor $CONTAINER_PATH
+	;;
+esac
+
+
+fi
+	;;
+	"以上操作仅对使用了spark-dwine-helper的应用生效")
+	
+	;;
+
+	*)
+	IS_CLOSE="1"
+	;;
+
+
+esac
+done

spark-dwine-helper/spark-dwine-helper-settings/usr/share/applications/spark-dwine-helper-settings.desktop

@@ -0,0 +1,13 @@
+[Desktop Entry]
+Categories=Utility;
+Encoding=UTF-8
+Exec=sh -c "/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh"
+Icon=spark-dwine-helper-settings
+MimeType=
+Name=Spark Wine Helper Settings
+Name[zh_CN]=星火wine助手设置
+StartupWMClass=spark-dwine-helper-settings
+Terminal=False
+Type=Application
+NoDisplay=false
+X-Deepin-Vendor=user-custom

spark-dwine-helper/uos-package-assets/opt/apps/store.spark-app.spark-dwine-helper/entries/applications/store.spark-app.spark-dwine-helper.desktop

@@ -0,0 +1,13 @@
+[Desktop Entry]
+Categories=Utility;
+Encoding=UTF-8
+Exec=sh -c "/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh"
+Icon=store.spark-app.spark-dwine-helper
+MimeType=
+Name=Spark Wine Helper Settings
+Name[zh_CN]=星火wine助手设置
+StartupWMClass=spark-dwine-helper-settings
+Terminal=False
+Type=Application
+NoDisplay=true
+X-Deepin-Vendor=user-custom

spark-dwine-launch/run-template_v1.sh

@@ -0,0 +1,111 @@
+#!/bin/sh
+
+#   Copyright (C) 2016 Deepin, Inc.
+#
+#   Author:     Li LongYu <lilongyu@linuxdeepin.com>
+#               Peng Hao <penghao@linuxdeepin.com>
+#
+#
+#   Copyright (C) 2022 The Spark Project
+#
+#
+#   Modifier    shenmo <shenmo@spark-app.store>
+#
+#
+#
+
+#######################函数段。下文调用的额外功能会在此处声明
+
+Get_Dist_Name()
+{
+    if grep -Eqii "Deepin" /etc/issue || grep -Eq "Deepin" /etc/*-release; then
+        DISTRO='Deepin'
+    elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then
+        DISTRO='UniontechOS'
+    else
+	 DISTRO='OtherOS'
+	fi
+}
+
+
+####获得发行版名称
+
+#########################预设值段
+
+version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
+####用于比较版本？未实装
+BOTTLENAME="容器名"
+APPVER="版本号"
+EXEC_PATH="启动路径"
+##### 软件在wine中的启动路径
+START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
+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
+## 如果用不到就不填，不要删除前面的注释用的#
+
+export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH`
+
+ARCHIVE_FILE_DIR="/opt/apps/$DEB_PACKAGE_NAME/files"
+
+export WINEDLLPATH=/opt/$APPRUN_CMD/lib:/opt/$APPRUN_CMD/lib64
+
+export WINEPREDLL="$ARCHIVE_FILE_DIR/dlls"
+
+DISABLE_ATTACH_FILE_DIALOG=""
+##默认为空。若为1，则不使用系统自带的文件选择，而是使用wine的
+##对于deepin/UOS，大部分的应用都不需要使用wine的，如果有需求（比如wine应用选择的限定种类文件系统的文管不支持）
+##请填1。
+##注意：因为非DDE的环境不确定，所以默认会在非Deepin/UOS发行版上禁用这个功能。如果你确认在适配的发行版上可以正常启动，请注释或者删除下面这段
+
+##############<<<<<<<<<禁用文件选择工具开始
+Get_Dist_Name
+#此功能实现参见结尾函数段
+if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then
+DISABLE_ATTACH_FILE_DIALOG="1"
+echo "非deepin/UOS，默认关闭系统自带的文件选择工具，使用Wine的"
+echo "如果你想改变这个行为，请到/opt/apps/$DEB_PACKAGE_NAME/files/$0处修改"
+echo "To打包者：如果你要打开自带请注意在适配的发行版上进行测试"
+echo "To用户：打包者没有打开这个功能，这证明启用这个功能可能造成运行问题。如果你要修改这个行为，请确保你有一定的动手能力"
+fi
+##############>>>>>>>>>禁用文件选择工具结束
+
+##############<<<<<<<<<屏蔽mono和gecko安装器开始
+##默认屏蔽mono和gecko安装器
+if [ "$APPRUN_CMD" = "spark-wine7-devel" ];then
+
+export WINEDLLOVERRIDES="mscoree,mshtml="
+#### "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"
+
+fi
+##############>>>>>>>>>屏蔽mono和gecko安装器结束
+
+#########################执行段
+
+
+
+
+if [ -z "$DISABLE_ATTACH_FILE_DIALOG" ];then
+    export ATTACH_FILE_DIALOG=1
+fi
+
+if [ -n "$EXPORT_ENVS" ];then
+    export $EXPORT_ENVS
+fi
+
+if [ -n "$EXEC_PATH" ];then
+    if [ -z "${EXEC_PATH##*.lnk*}" ];then
+        $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
+    else
+        $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
+    fi
+else
+    $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
+fi
+
+