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

Patch in mainline automod changes

Browse source
This commit is contained in:
aclist 2022-12-03 21:20:36 +09:00
parent 986e137d8d
commit 8b6b19d3c0
1 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
dzgui.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -o pipefail set -o pipefail
version=3.1.0-rc.21 version=3.2.1-rc.1
aid=221100 aid=221100
game="dayz" game="dayz"
@ -215,7 +215,7 @@ freedesktop_dirs(){
#TODO: update url #TODO: update url
curl -s "$version_url" > "$sd_install_path/dzgui.sh" curl -s "$version_url" > "$sd_install_path/dzgui.sh"
chmod +x "$sd_install_path/dzgui.sh" chmod +x "$sd_install_path/dzgui.sh"
img_url="$testing_url/images" img_url="$stable_url/images"
for i in dzgui grid.png hero.png logo.png; do for i in dzgui grid.png hero.png logo.png; do
curl -s "$img_url/$i" > "$sd_install_path/$i" curl -s "$img_url/$i" > "$sd_install_path/$i"
done done
@ -318,7 +318,6 @@ run_varcheck(){
} }
config(){ config(){
if [[ ! -f $config_file ]]; then if [[ ! -f $config_file ]]; then
#echo "100"
$steamsafe_zenity --width 500 --info --text="Config file not found. Click OK to proceed to first-time setup." 2>/dev/null $steamsafe_zenity --width 500 --info --text="Config file not found. Click OK to proceed to first-time setup." 2>/dev/null
code=$? code=$?
#TODO: prevent progress if user hits ESC #TODO: prevent progress if user hits ESC
@ -581,16 +580,10 @@ connect(){
[[ $auto_install -eq 2 ]] && merge_modlists [[ $auto_install -eq 2 ]] && merge_modlists
if [[ -n $diff ]]; then if [[ -n $diff ]]; then
[[ -z $(is_steam_running) ]] && { $steamsafe_zenity --info --text "Steam must be running on the current desktop to use this feature."; return; } [[ -z $(is_steam_running) ]] && { $steamsafe_zenity --info --text "Steam must be running on the current desktop to use this feature."; return; }
#TODO: headless is deprecated case $auto_install in
if [[ $auto_install -eq 1 ]]; then 1|2) auto_mod_install ;;
headless_mod_install "$diff" *) manual_mod_install ;;
rc=$? esac
[[ $rc -eq 1 ]] && manual_mod_install
elif [[ $auto_install -eq 2 ]]; then
auto_mod_install
else
manual_mod_install
fi
else else
passed_mod_check > >($steamsafe_zenity --pulsate --progress --auto-close --width=500 2>/dev/null) passed_mod_check > >($steamsafe_zenity --pulsate --progress --auto-close --width=500 2>/dev/null)
update_history update_history
@ -1039,7 +1032,7 @@ find_default_path(){
case "$res" in case "$res" in
*auto*) discover ;; *auto*) discover ;;
*manual*) *manual*)
zenity --info --text="\nSelect the top-level path to the Steam library folder containing \"steamapps\".\n\nE.g., if DayZ is installed at:\n\"/media/mydrive/steamapps/common/DayZ\"\n\nYou should select:\n\"/media/mydrive\"" --width=500 && zenity --info --text="\nSelect the top-level entry point to the location where Steam (not DayZ)\nis installed and before entering the \"steamapps\" path.\n\nE.g., if Steam is installed at:\n\"/media/mydrive/Steam\"\n\nCorrect:\n- \"/media/mydrive/Steam\"\n\nIncorrect:\n- \"/media/mydrive/Steam/steamapps/common/DayZ\"\n- \"/media/mydrive/\"" --width=500 &&
file_picker ;; file_picker ;;
esac esac
fi fi
@ -1084,9 +1077,8 @@ force_update_mods(){
} }
options_menu(){ options_menu(){
case "$auto_install" in case "$auto_install" in
0) auto_hr="OFF"; headless_hr="OFF" ;; 0|1|"") auto_hr="OFF"; ;;
1) auto_hr="OFF"; headless_hr="ON" ;; 2) auto_hr="ON"; ;;
2) auto_hr="ON"; headless_hr="OFF" ;;
esac esac
debug_list=( debug_list=(
"Toggle branch" "Toggle branch"
@ -1094,8 +1086,10 @@ options_menu(){
"Generate debug log" "Generate debug log"
"Toggle auto mod install [$auto_hr]" "Toggle auto mod install [$auto_hr]"
) )
[[ $auto_install -eq 2 ]] && debug_list+=("Force update local mods") #TODO: tech debt: drop old flags
[[ $auto_install -eq 2 ]] || [[ $auto_install -eq 1 ]] && debug_list+=("Force update local mods")
debug_sel=$($steamsafe_zenity --list --width=1280 --height=800 --column="Options" --title="DZGUI" --hide-header "${debug_list[@]}" 2>/dev/null) debug_sel=$($steamsafe_zenity --list --width=1280 --height=800 --column="Options" --title="DZGUI" --hide-header "${debug_list[@]}" 2>/dev/null)
[[ -z $debug_sel ]] && return
if [[ $debug_sel == "${debug_list[0]}" ]]; then if [[ $debug_sel == "${debug_list[0]}" ]]; then
enforce_dl=1 enforce_dl=1
toggle_branch && toggle_branch &&
@ -1113,7 +1107,7 @@ options_menu(){
elif [[ $debug_sel == "${debug_list[4]}" ]]; then elif [[ $debug_sel == "${debug_list[4]}" ]]; then
force_update=1 force_update=1
force_update_mods force_update_mods
merge_modlists > >($steamsafe_zenity --pulsate --progress --auto-close --title=DZGUI --width=500 2>/dev/null) merge_modlists > >($steamsafe_zenity --pulsate --progress --no-cancel --auto-close --title=DZGUI --width=500 2>/dev/null)
[[ -z $(is_steam_running) ]] && { $steamsafe_zenity --info --text "Steam must be running on the current desktop to use this feature."; return; } [[ -z $(is_steam_running) ]] && { $steamsafe_zenity --info --text "Steam must be running on the current desktop to use this feature."; return; }
auto_mod_install auto_mod_install
fi fi