jiriks74/dztui
1
0
Fork 0
mirror of https://github.com/aclist/dztui.git synced 2024-12-29 13:52:03 +01:00
Code Issues Wiki Activity Actions

fix: distinguish between flatpak and xdg-open

Browse source
This commit is contained in:
aclist 2023-01-19 23:09:48 +09:00
parent 22f542ba67
commit 11ab8777eb
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dzgui.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -o pipefail set -o pipefail
version=3.2.0-rc.4 version=3.2.0-rc.5
aid=221100 aid=221100
game="dayz" game="dayz"
@ -340,7 +340,7 @@ steam_deck_mods(){
rc=$? rc=$?
if [[ $rc -eq 0 ]]; then if [[ $rc -eq 0 ]]; then
echo "[DZGUI] Opening ${workshop}$next" echo "[DZGUI] Opening ${workshop}$next"
"$steam_cmd" steam://url/CommunityFilePage/$next 2>/dev/null & "$sbp_cmd" steam://url/CommunityFilePage/$next 2>/dev/null &
$steamsafe_zenity --info --title="DZGUI" --ok-label="Next" --text="Click [Next] to continue mod check." --width=500 2>/dev/null $steamsafe_zenity --info --title="DZGUI" --ok-label="Next" --text="Click [Next] to continue mod check." --width=500 2>/dev/null
else else
return 1 return 1
@ -380,7 +380,7 @@ manual_mod_install(){
[[ -f $ex ]] && return 1 [[ -f $ex ]] && return 1
local downloads_dir="$steam_path/steamapps/workshop/downloads/$aid" local downloads_dir="$steam_path/steamapps/workshop/downloads/$aid"
local workshop_dir="$steam_path/steamapps/workshop/content/$aid" local workshop_dir="$steam_path/steamapps/workshop/content/$aid"
"$steam_cmd" "steam://url/CommunityFilePage/${stage_mods[$i]}" "$sbp_cmd" "steam://url/CommunityFilePage/${stage_mods[$i]}"
echo "# Opening workshop page for ${stage_mods[$i]}. If you see no progress after subscribing, try unsubscribing and resubscribing again until the download commences." echo "# Opening workshop page for ${stage_mods[$i]}. If you see no progress after subscribing, try unsubscribing and resubscribing again until the download commences."
sleep 1s sleep 1s
foreground foreground
@ -467,7 +467,7 @@ auto_mod_install(){
[[ -f "/tmp/dz.status" ]] && rm "/tmp/dz.status" [[ -f "/tmp/dz.status" ]] && rm "/tmp/dz.status"
touch "/tmp/dz.status" touch "/tmp/dz.status"
console_dl "$diff" && console_dl "$diff" &&
"$steam_cmd" steam://open/downloads && 2>/dev/null 1>&2 "$sbp_cmd" steam://open/downloads && 2>/dev/null 1>&2
win=$(xdotool search --name "DZG Watcher") win=$(xdotool search --name "DZG Watcher")
xdotool windowactivate $win xdotool windowactivate $win
until [[ -z $(comm -23 <(printf "%s\n" "${modids[@]}" | sort) <(ls -1 $workshop_dir | sort)) ]]; do until [[ -z $(comm -23 <(printf "%s\n" "${modids[@]}" | sort) <(ls -1 $workshop_dir | sort)) ]]; do
@ -1095,13 +1095,15 @@ force_update_mods(){
fi fi
} }
toggle_steam_binary(){ toggle_steam_binary(){
case $steam_cmd in case $sbp_cmd in
steam) steam)
steam_cmd=xdg-open sbp_cmd="xdg-open"
steam_cmd="flatpak run com.valvesoftware.Steam"
popup 700 popup 700
;; ;;
xdg-open) xdg-open)
steam_cmd=steam sbp_cmd="steam"
steam_cmd="steam"
popup 800;; popup 800;;
esac esac
} }
@ -1118,7 +1120,7 @@ options_menu(){
) )
#TODO: tech debt: drop old flags #TODO: tech debt: drop old flags
[[ $auto_install -eq 2 ]] || [[ $auto_install -eq 1 ]] && debug_list+=("Force update local mods") [[ $auto_install -eq 2 ]] || [[ $auto_install -eq 1 ]] && debug_list+=("Force update local mods")
case $steam_cmd in case $sbp_cmd in
steam) steam_hr=Steam ;; steam) steam_hr=Steam ;;
xdg-open) steam_hr=Flatpak ;; xdg-open) steam_hr=Flatpak ;;
esac esac
@ -1777,11 +1779,14 @@ steam_deps(){
exit exit
elif [[ -n "$steam" ]] && [[ -n "$flatpak" ]]; then elif [[ -n "$steam" ]] && [[ -n "$flatpak" ]]; then
toggle_steam=1 toggle_steam=1
sbp_cmd="steam"
steam_cmd="steam" steam_cmd="steam"
elif [[ -n "$steam" ]]; then elif [[ -n "$steam" ]]; then
sbp_cmd="steam"
steam_cmd="steam" steam_cmd="steam"
else else
steam_cmd="xdg-open" sbp_cmd="xdg-open"
steam_cmd="flatpak run com.valvesoftware.Steam"
fi fi
} }
initial_setup(){ initial_setup(){