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(automods): Mods to update not breaking on new line

Browse source
This commit is contained in:
aclist 2023-01-18 23:05:38 +09:00
parent 735ca114d0
commit e21b3fbec0
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
changelog.md
View file

@ -2,9 +2,14 @@
## [Unreleased] ## [Unreleased]
- Clean up logging - Clean up logging
- Custom query API
- Standardize dialogs - Standardize dialogs
- Validate BM API key - Custom query API
- Store favorites by IP
## [3.1.8] 2023-01-18
### Fixed
- Progress window blocking rest of window stack
- Bug when updating old mods if automod set to ON
## [3.1.7] 2023-01-06 ## [3.1.7] 2023-01-06
### Fixed ### Fixed

10
dzgui.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -o pipefail set -o pipefail
version=3.1.7 version=3.1.8
aid=221100 aid=221100
game="dayz" game="dayz"
@ -396,7 +396,7 @@ manual_mod_install(){
until [[ -d $workshop_dir/${stage_mods[$i]} ]]; do until [[ -d $workshop_dir/${stage_mods[$i]} ]]; do
[[ -f $ex ]] && return 1 [[ -f $ex ]] && return 1
sleep 0.1s sleep 0.1s
done done
foreground foreground
echo "# ${stage_mods[$i]} moved to mods dir" echo "# ${stage_mods[$i]} moved to mods dir"
done done
@ -468,9 +468,9 @@ auto_mod_install(){
touch "/tmp/dz.status" touch "/tmp/dz.status"
console_dl "$diff" && console_dl "$diff" &&
steam steam://open/downloads && 2>/dev/null 1>&2 steam steam://open/downloads && 2>/dev/null 1>&2
win=$(xdotool search --name "DZG Watcher")
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
win=$(xdotool search --name "DZG Watcher")
[[ ! $(xdotool getwindowfocus) -eq $win ]] && xdotool windowactivate $win
local missing=$(comm -23 <(printf "%s\n" "${modids[@]}" | sort) <(ls -1 $workshop_dir | sort) | wc -l) local missing=$(comm -23 <(printf "%s\n" "${modids[@]}" | sort) <(ls -1 $workshop_dir | sort) | wc -l)
echo "# Downloaded $((${#modids[@]}-missing)) of ${#modids[@]} mods" echo "# Downloaded $((${#modids[@]}-missing)) of ${#modids[@]} mods"
done | $steamsafe_zenity --pulsate --progress --title="DZG Watcher" --auto-close --no-cancel --width=500 2>/dev/null done | $steamsafe_zenity --pulsate --progress --title="DZG Watcher" --auto-close --no-cancel --width=500 2>/dev/null
@ -543,7 +543,7 @@ merge_modlists(){
elif [[ -n "$diff" ]] && [[ ${#needs_update[@]} -eq 0 ]]; then elif [[ -n "$diff" ]] && [[ ${#needs_update[@]} -eq 0 ]]; then
: :
else else
diff="$(echo -e "$diff\n${needs_update[@]}")" diff="$(printf "%s\n%s\n" "$diff" "${needs_update[@]}")"
fi fi
[[ $force_update -eq 1 ]] && echo "100" [[ $force_update -eq 1 ]] && echo "100"
} }