jiriks74/dztui
1
0
Fork 0
mirror of https://github.com/aclist/dztui.git synced 2024-12-28 21:32:36 +01:00
Code Issues Wiki Activity Actions

fix(flatpak): retain preferred client setting

Browse source
This commit is contained in:
aclist 2023-01-20 01:21:02 +09:00
parent 11ab8777eb
commit 5fd40cf3af
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
dzgui.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -o pipefail set -o pipefail
version=3.2.0-rc.5 version=3.3.0-rc.1
aid=221100 aid=221100
game="dayz" game="dayz"
@ -194,6 +194,9 @@ staging_dir="$staging_dir"
#Path to default Steam client #Path to default Steam client
default_steam_path="$default_steam_path" default_steam_path="$default_steam_path"
#Preferred Steam launch command (for Flatpak support)
sbp_cmd="$sbp_cmd"
END END
} }
write_desktop_file(){ write_desktop_file(){
@ -1099,11 +1102,15 @@ toggle_steam_binary(){
steam) steam)
sbp_cmd="xdg-open" sbp_cmd="xdg-open"
steam_cmd="flatpak run com.valvesoftware.Steam" steam_cmd="flatpak run com.valvesoftware.Steam"
preferred_client=$sbp_cmd
update_sbp_cmd
popup 700 popup 700
;; ;;
xdg-open) xdg-open)
sbp_cmd="steam" sbp_cmd="steam"
steam_cmd="steam" steam_cmd="steam"
preferred_client=$sbp_cmd
update_sbp_cmd
popup 800;; popup 800;;
esac esac
} }
@ -1770,17 +1777,28 @@ fetch_helpers(){
mkdir -p "$helpers_path" mkdir -p "$helpers_path"
[[ ! -f "$helpers_path/vdf2json.py" ]] && curl -Ls "$vdf2json_url" > "$helpers_path/vdf2json.py" [[ ! -f "$helpers_path/vdf2json.py" ]] && curl -Ls "$vdf2json_url" > "$helpers_path/vdf2json.py"
} }
update_sbp_cmd(){
local new_cmd
new_cmd="preferred_client=\"$preferred_client\""
mv $config_file ${config_path}dztuirc.old
nr=$(awk '/preferred_client=/ {print NR}' ${config_path}dztuirc.old)
awk -v "var=$new_cmd" -v "nr=$nr" 'NR==nr {$0=var}{print}' ${config_path}dztuirc.old > ${config_path}dztuirc
}
steam_deps(){ steam_deps(){
local flatpak steam local flatpak steam new_cmd
flatpak=$(flatpak list | grep valvesoftware.Steam) flatpak=$(flatpak list | grep valvesoftware.Steam)
flatpak="yes"
steam=$(command -v steam) steam=$(command -v steam)
if [[ -z "$steam" ]] && [[ -z "$flatpak" ]]; then if [[ -z "$steam" ]] && [[ -z "$flatpak" ]]; then
warn "Requires Steam or Flatpak Steam" warn "Requires Steam or Flatpak Steam"
exit exit
elif [[ -n "$steam" ]] && [[ -n "$flatpak" ]]; then elif [[ -n "$steam" ]] && [[ -n "$flatpak" ]]; then
echo updating >> $HOME/dzlog
toggle_steam=1 toggle_steam=1
sbp_cmd="steam" sbp_cmd="steam"
steam_cmd="steam" steam_cmd="steam"
[[ -n $preferred_client ]] && sbp_cmd=$preferred_client
[[ -z $preferred_client ]] && { preferred_client=$sbp_cmd; update_sbp_cmd; }
elif [[ -n "$steam" ]]; then elif [[ -n "$steam" ]]; then
sbp_cmd="steam" sbp_cmd="steam"
steam_cmd="steam" steam_cmd="steam"
@ -1793,12 +1811,12 @@ initial_setup(){
echo "# Initial setup" echo "# Initial setup"
run_depcheck run_depcheck
watcher_deps watcher_deps
steam_deps
check_architecture check_architecture
check_version check_version
check_map_count check_map_count
fetch_helpers fetch_helpers
config config
steam_deps
run_varcheck run_varcheck
stale_symlinks stale_symlinks
init_items init_items