File tree Expand file tree Collapse file tree 5 files changed +40
-9
lines changed
Expand file tree Collapse file tree 5 files changed +40
-9
lines changed Original file line number Diff line number Diff line change 33run_path=$( dirname " $0 " )
44base_path=" $( dirname " $run_path " ) "
55exec_name=" Steam++"
6- rm -rf " $HOME /Desktop/Watt Toolkit.desktop" 2> /dev/null
6+ # 检查XDG_DESKTOP_DIR环境变量,如果未设置则使用默认值,支持KDE的中文桌面路径
7+ if command -v xdg-user-dir & > /dev/null; then
8+ XDG_DESKTOP_DIR=$( xdg-user-dir DESKTOP)
9+ else
10+ XDG_DESKTOP_DIR=" $HOME /Desktop"
11+ fi
12+ rm -rf " $XDG_DESKTOP_DIR /Watt Toolkit.desktop" 2> /dev/null
713echo " #!/usr/bin/env xdg-open
814[Desktop Entry]
915Name=Watt Toolkit
1016Exec=$base_path /$exec_name .sh
1117Icon=$base_path /Icons/Watt-Toolkit.png
1218Terminal=false
1319Type=Application
14- StartupNotify=false" > " $HOME /Desktop /Watt Toolkit.desktop"
15- chmod +x " $HOME /Desktop /Watt Toolkit.desktop"
20+ StartupNotify=false" > " $XDG_DESKTOP_DIR /Watt Toolkit.desktop"
21+ chmod +x " $XDG_DESKTOP_DIR /Watt Toolkit.desktop"
1622exit 0
Original file line number Diff line number Diff line change 188188chmod +x " $base_path /$exec_name .sh"
189189# xdg-icon-resource install "$base_path/Icons/Watt-Toolkit.png" --size 128 Watt-Toolkit
190190InitDesktop () {
191+ # 检查XDG_DESKTOP_DIR环境变量,如果未设置则使用默认值,支持KDE的中文桌面路径
192+ if command -v xdg-user-dir & > /dev/null; then
193+ XDG_DESKTOP_DIR=$( xdg-user-dir DESKTOP)
194+ else
195+ XDG_DESKTOP_DIR=" $HOME /Desktop"
196+ fi
197+
191198 while true ; do
192199 # 使用 zenity 提示用户选择安装路径或使用默认路径
193- choice=$( zenity --list --radiolist --title=" 请选择要添加到的位置" --column=" 选择" --column=" 路径" TRUE " $HOME /.local/share/applications/" FALSE " $HOME /Desktop " )
200+ choice=$( zenity --list --radiolist --title=" 请选择要添加到的位置" --column=" 选择" --column=" 路径" TRUE " $HOME /.local/share/applications/" FALSE " $XDG_DESKTOP_DIR " )
194201
195202 # 检查用户输入
196203 if [ " $choice " == " $HOME /.local/share/applications/" ]; then
197204 target_dir=" $HOME /.local/share/applications/"
198205 break
199- elif [ " $choice " == " $HOME /Desktop " ]; then
200- target_dir=" $HOME /Desktop/ "
206+ elif [ " $choice " == " $XDG_DESKTOP_DIR " ]; then
207+ target_dir=" $XDG_DESKTOP_DIR "
201208 break
202209 else
203210 echo " 无效选项,请输入 1 或 2。"
Original file line number Diff line number Diff line change @@ -422,8 +422,12 @@ Kill_Process
422422Decompression
423423# xdg-icon-resource install " $base_path /Icons/Watt-Toolkit.png" --size 128 Watt-Toolkit
424424InitDesktop() {
425- # 检查XDG_DESKTOP_DIR环境变量,如果未设置则使用默认值
426- XDG_DESKTOP_DIR=" ${XDG_DESKTOP_DIR:- $HOME / Desktop} "
425+ # 检查XDG_DESKTOP_DIR环境变量,如果未设置则使用默认值,支持KDE的中文桌面路径
426+ if command -v xdg-user-dir &>/dev/null; then
427+ XDG_DESKTOP_DIR=$( xdg-user-dir DESKTOP)
428+ else
429+ XDG_DESKTOP_DIR=" $HOME /Desktop"
430+ fi
427431
428432 while true; do
429433 # 使用 zenity 提示用户选择安装路径或使用默认路径
Original file line number Diff line number Diff line change 1+ #! /bin/bash
2+ # 检查XDG_DESKTOP_DIR环境变量,如果未设置则使用默认值,支持KDE的中文桌面路径
3+ if command -v xdg-user-dir & > /dev/null; then
4+ XDG_DESKTOP_DIR=$( xdg-user-dir DESKTOP)
5+ else
6+ XDG_DESKTOP_DIR=" $HOME /Desktop"
7+ fi
8+ echo $XDG_DESKTOP_DIR
Original file line number Diff line number Diff line change 9595rm -rf $Cache 2> /dev/null
9696rm -rf $Cache_t 2> /dev/null
9797rm -rf $base_path 2> /dev/null
98- rm -rf " $HOME /Desktop/Watt Toolkit.desktop" 2> /dev/null
98+ # 检查XDG_DESKTOP_DIR环境变量,如果未设置则使用默认值,支持KDE的中文桌面路径
99+ if command -v xdg-user-dir & > /dev/null; then
100+ XDG_DESKTOP_DIR=$( xdg-user-dir DESKTOP)
101+ else
102+ XDG_DESKTOP_DIR=" $HOME /Desktop"
103+ fi
104+ rm -rf " $XDG_DESKTOP_DIR /Watt Toolkit.desktop" 2> /dev/null
99105zenity --info --text=" 卸载完成!" --width=300
You can’t perform that action at this time.
0 commit comments