Compare commits

...

11 Commits
2.0.3 ... 2.3

Author SHA1 Message Date
4207be55e2 仅仅在是链接时候才确认是mydoc 2023-04-21 17:09:26 +08:00
34698b710e 2.3 2023-04-21 17:03:14 +08:00
93364b1057 修复旧的wine6容器反而找不到文档位置
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2023-04-21 00:12:16 +00:00
38bca59428 update spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_updater.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2023-04-20 23:57:12 +00:00
e85a14badf update spark-dwine-launch/postrm_template.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2023-04-19 05:47:24 +00:00
16085fe911 update spark-dwine-launch/postrm_template.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2023-04-19 05:46:36 +00:00
e829b54682 修复wine8下找不到文档的问题 2023-04-19 13:26:47 +08:00
f69c86864f Merge remote-tracking branch 'refs/remotes/origin/master' 2023-04-14 14:47:56 +08:00
53b12e1b8d get_tray_window 2023-04-14 14:47:46 +08:00
1d175af65c runv4忘记改了,私密马赛
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2023-04-13 08:54:33 +00:00
f5d453d699 使用spark_updater 2023-04-13 16:48:07 +08:00
5 changed files with 93 additions and 11 deletions

View File

@@ -0,0 +1,28 @@
#!/usr/bin/env python2
# vim: set ts=4 sw=4 fileencoding=utf-8:
# Luomio <nohappiness@gmail.com>
# Filename: dde-first-run.py
# Create Date: 27-03, 13
def get_tray_window():
try:
import gobject
from dbus import glib
import dbus
except ImportError:
return False
gobject.threads_init()
glib.init_threads()
bus = dbus.SessionBus()
traymanager = bus.get_object("com.deepin.dde.TrayManager", "/com/deepin/dde/TrayManager")
windows = traymanager.Get("com.deepin.dde.TrayManager","TrayIcons")
str="window_id:"
for i in xrange(len(windows)):
str += '{:#x} '.format(windows[i])
print(str)
if __name__ == "__main__":
get_tray_window()

View File

@@ -215,7 +215,7 @@ kill_app()
get_tray_window()
{
$SHELL_DIR/get_tray_window | awk -F: '{print $2}'
$SHELL_DIR/spark_get_tray_window | awk -F: '{print $2}'
}
get_stacking_window()

View File

@@ -134,7 +134,7 @@ CallProcess()
is_autostart $DEB_PACKAGE_NAME
autostart=$?
if [ $autostart -ne 0 ];then
$SHELL_DIR/kill_spark.sh "$BOTTLENAME" block
$SHELL_DIR/spark_kill.sh "$BOTTLENAME" block
fi
#change current dir to excute path
@@ -148,6 +148,18 @@ CallProcess()
fi
# Disable winemenubuilder
env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v winemenubuilder.exe /f
# Link to Document
if [ -L "$WINEPREFIX/drive_c/users/$(logname)/My Documents" ]; then
env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders' /t REG_EXPAND_SZ /v Personal /d "%USERPROFILE%\My Documents" /f
else
env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders' /t REG_EXPAND_SZ /v Personal /d "%USERPROFILE%\Documents" /f
fi
debug_log_to_file "Starting process $* ..."
############# WARNING: Here is the modified content: Now will run set-dwine-scale.sh
@@ -254,7 +266,7 @@ CallZhuMu()
CallQQGame()
{
debug_log "run $1"
$SHELL_DIR/kill_spark.sh qqgame block
$SHELL_DIR/spark_kill.sh qqgame block
env WINEPREFIX="$WINEPREFIX" $WINE_CMD "$1" &
}
@@ -341,7 +353,7 @@ CallWXWork()
CallDingTalk()
{
debug_log "run $1"
$SHELL_DIR/kill_spark.sh DingTalk block
$SHELL_DIR/spark_kill.sh DingTalk block
CallProcess "$@"
}
@@ -404,7 +416,7 @@ CallFoxmail()
CallTHS()
{
$SHELL_DIR/kill_spark.sh ths block
$SHELL_DIR/spark_kill.sh ths block
debug_log "Start run $1"
#get file full path
@@ -414,7 +426,7 @@ CallTHS()
#kill bloack process
name="${path##*/}"
$SHELL_DIR/kill_spark.sh "$name" block
$SHELL_DIR/spark_kill.sh "$name" block
#change current dir to excute path
path=$(dirname "$path")
@@ -432,7 +444,7 @@ CallTHS()
CallQQGameV2()
{
debug_log "run $1"
$SHELL_DIR/kill_spark.sh QQMicroGameBox block
$SHELL_DIR/spark_kill.sh QQMicroGameBox block
CallProcess "$1" -action:force_download -appid:${2} -pid:8 -bin_version:1.1.2.4 -loginuin:
}
@@ -447,7 +459,7 @@ CallPsCs6()
#kill bloack process
name="${path##*/}"
$SHELL_DIR/kill_spark.sh "$name" block
$SHELL_DIR/spark_kill.sh "$name" block
#change current dir to excute path
path=$(dirname "$path")
@@ -632,7 +644,7 @@ UpdateApp()
esac
ExtractApp "${WINEPREFIX}.tmpdir"
$SHELL_DIR/updater -s "${WINEPREFIX}.tmpdir" -c "${WINEPREFIX}" -v
$SHELL_DIR/spark_updater -s "${WINEPREFIX}.tmpdir" -c "${WINEPREFIX}" -v
rm -rf "${WINEPREFIX}.tmpdir"

View File

@@ -0,0 +1,42 @@
#!/bin/bash
# 检查是否提供了-c和-s选项
if [[ ! "$*" =~ "-c" ]] || [[ ! "$*" =~ "-s" ]]; then
echo "用法: updater -c <目标目录> -s <源目录> [-v]"
exit 1
fi
# 解析命令行参数
while getopts ":c:s:v" opt; do
case $opt in
c)
destination_dir=$OPTARG
;;
s)
source_dir=$OPTARG
;;
v)
verbose=true
;;
\?)
echo "无效选项: -$OPTARG" >&2
exit 1
;;
:)
echo "选项 -$OPTARG 需要一个参数." >&2
exit 1
;;
esac
done
# 从源目录复制文件到目标目录
if [ "$verbose" = true ]; then
echo "正在从 $source_dir 复制文件到 $destination_dir"
fi
# 使用cp命令覆盖同名文件
cp -rf "$source_dir"/* "$destination_dir"
echo "文件复制完成!"
exit 0

View File

@@ -40,8 +40,8 @@ echo "W: 没有指定容器,跳过清理容器。请手动前往 ~/.deepinwine
exit
fi
if [ -e /opt/deepinwine/tools/kill.sh ];then
/opt/deepinwine/tools/kill.sh $BOTTLE_NAME
if [ -e /opt/deepinwine/tools/spark_kill.sh ];then
/opt/deepinwine/tools/spark_kill.sh $BOTTLE_NAME
###这里注意如果没写BOTTLE_NAME,会把QQ杀了
fi