jiriks74/dztui
1
0
Fork 0
mirror of https://github.com/aclist/dztui.git synced 2025-01-01 15:12:05 +01:00
Code Issues Wiki Activity Actions

fix: use safe separator on forms

Browse source
This commit is contained in:
aclist 2023-05-14 05:47:20 +09:00
parent 3d52b89e62
commit 030d8efdf4
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
dzgui.sh
View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -o pipefail set -o pipefail
version=3.2.20 version=3.2.21
aid=221100 aid=221100
game="dayz" game="dayz"
@ -228,17 +228,17 @@ freedesktop_dirs(){
fi fi
} }
find_library_folder(){ find_library_folder(){
echo "ENTERED: ${FUNCNAME[0]}" >> /tmp/debug.log echo "ENTERED: ${FUNCNAME[0]}" >> /tmp/dzdebug.log
echo "RECEIVED ARG: $1" >> /tmp/debug.log echo "RECEIVED ARG: $1" >> /tmp/dzdebug.log
steam_path="$(python3 "$helpers_path/vdf2json.py" -i "$1/steamapps/libraryfolders.vdf" | jq -r '.libraryfolders[]|select(.apps|has("221100")).path')" steam_path="$(python3 "$helpers_path/vdf2json.py" -i "$1/steamapps/libraryfolders.vdf" | jq -r '.libraryfolders[]|select(.apps|has("221100")).path')"
echo "STEAM PATH RESOLVED TO: $steam_path" >> /tmp/debug.log echo "STEAM PATH RESOLVED TO: $steam_path" >> /tmp/dzdebug.log
} }
file_picker(){ file_picker(){
echo "${FUNCNAME[0]}" >> /tmp/debug.log echo "${FUNCNAME[0]}" >> /tmp/dzdebug.log
local path=$($steamsafe_zenity --file-selection --directory 2>/dev/null) local path=$($steamsafe_zenity --file-selection --directory 2>/dev/null)
echo "FILE PICKER PATH RESOLVED TO: $path" >> /tmp/debug.log echo "FILE PICKER PATH RESOLVED TO: $path" >> /tmp/dzdebug.log
if [[ -z "$path" ]]; then if [[ -z "$path" ]]; then
echo "PATH WAS EMPTY" >> /tmp/debug.log echo "PATH WAS EMPTY" >> /tmp/dzdebug.log
return return
else else
default_steam_path="$path" default_steam_path="$path"
@ -256,11 +256,11 @@ create_config(){
return return
} }
while true; do while true; do
player_input="$($steamsafe_zenity --forms --add-entry="Player name (required for some servers)" --add-entry="BattleMetrics API key" --add-entry="Steam API key" --title="DZGUI" --text="DZGUI" $sd_res --separator="│" 2>/dev/null)" player_input="$($steamsafe_zenity --forms --add-entry="Player name (required for some servers)" --add-entry="BattleMetrics API key" --add-entry="Steam API key" --title="DZGUI" --text="DZGUI" $sd_res --separator="@" 2>/dev/null)"
#explicitly setting IFS crashes $steamsafe_zenity in loop #explicitly setting IFS crashes $steamsafe_zenity in loop
#and mapfile does not support high ascii delimiters #and mapfile does not support high ascii delimiters
#so split fields with newline #so split fields with newline
readarray -t args < <(echo "$player_input" | sed 's/│/\n/g') readarray -t args < <(echo "$player_input" | sed 's/@/\n/g')
name="${args[0]}" name="${args[0]}"
api_key="${args[1]}" api_key="${args[1]}"
steam_api="${args[2]}" steam_api="${args[2]}"
@ -312,7 +312,7 @@ run_depcheck(){
fi fi
} }
debug(){ debug(){
echo "$*" >> /tmp/debug.log echo "$*" >> /tmp/dzdebug.log
} }
check_pyver(){ check_pyver(){
debug "ENTERED ${FUNCNAME[0]}" debug "ENTERED ${FUNCNAME[0]}"
@ -1062,7 +1062,7 @@ console_dl(){
done done
} }
find_default_path(){ find_default_path(){
echo "ENTER: ${FUNCNAME[0]}" >> /tmp/debug.log echo "ENTER: ${FUNCNAME[0]}" >> /tmp/dzdebug.log
discover(){ discover(){
echo "# Searching for Steam" echo "# Searching for Steam"
default_steam_path=$(find / -type d \( -path "/proc" -o -path "*/timeshift" -o -path "$HOME/.var" -o -path \ default_steam_path=$(find / -type d \( -path "/proc" -o -path "*/timeshift" -o -path "$HOME/.var" -o -path \
@ -1081,7 +1081,7 @@ find_default_path(){
default_steam_path="$HOME/.steam/steam" default_steam_path="$HOME/.steam/steam"
else else
local res=$(echo -e "Let DZGUI auto-discover Steam path (accurate, slower)\nSelect the Steam path manually (less accurate, faster)" | $steamsafe_zenity --list --column="Choice" --title=DZGUI --hide-header --text="Steam is not installed in a standard location." $sd_res) local res=$(echo -e "Let DZGUI auto-discover Steam path (accurate, slower)\nSelect the Steam path manually (less accurate, faster)" | $steamsafe_zenity --list --column="Choice" --title=DZGUI --hide-header --text="Steam is not installed in a standard location." $sd_res)
echo "USER CHOSE: $res" >> /tmp/debug.log echo "USER CHOSE: $res" >> /tmp/dzdebug.log
case "$res" in case "$res" in
*auto*) discover ;; *auto*) discover ;;
*manual*) *manual*)
@ -1090,7 +1090,7 @@ find_default_path(){
esac esac
fi fi
fi fi
echo "FOUND DEFAULT PATH AT: $default_steam_path" >> /tmp/debug.log echo "FOUND DEFAULT PATH AT: $default_steam_path" >> /tmp/dzdebug.log
} }
popup(){ popup(){
pop(){ pop(){
@ -1636,6 +1636,7 @@ download_new_version(){
if [[ $rc -eq 0 ]]; then if [[ $rc -eq 0 ]]; then
echo "[DZGUI] Wrote $upstream to $source_script" echo "[DZGUI] Wrote $upstream to $source_script"
chmod +x $source_script chmod +x $source_script
#FIXME: doesnt exist yet
touch ${config_path}.unmerged touch ${config_path}.unmerged
echo "100" echo "100"
$steamsafe_zenity --question --width 500 --title="DZGUI" --text "DZGUI $upstream successfully downloaded.\nTo view the changelog, select Changelog.\nTo use the new version, select Exit and restart." --ok-label="Changelog" --cancel-label="Exit" 2>/dev/null $steamsafe_zenity --question --width 500 --title="DZGUI" --text "DZGUI $upstream successfully downloaded.\nTo view the changelog, select Changelog.\nTo use the new version, select Exit and restart." --ok-label="Changelog" --cancel-label="Exit" 2>/dev/null