diff --git a/dzgui.sh b/dzgui.sh index d74c660..8d5629f 100755 --- a/dzgui.sh +++ b/dzgui.sh @@ -1,7 +1,7 @@ #!/bin/bash set -o pipefail -version=2.8.0-rc.15 +version=2.8.0-rc.16 aid=221100 game="dayz" @@ -418,24 +418,34 @@ auto_mod_install(){ } manual_mod_install(){ l=0 - if [[ $is_steam_deck -eq 0 ]]; then - open_mod_links - until [[ -z $diff ]]; do - zenity --question --title="DZGUI" --ok-label="Next" --cancel-label="Cancel" --text="Opened mod links in browser.\nClick [Next] when all mods have been subscribed to.\nThis dialog may reappear if clicking [Next] too soon\nbefore mods are synchronized in the background." --width=500 2>/dev/null - rc=$? - if [[ $rc -eq 0 ]]; then - compare - open_mod_links - else - return - fi + for i in "$diff"; do + workshop_dir="$steam_path/steamapps/workshop/content/$aid" + steam "steam://url/CommunityFilePage/$i" + until [[ -d $workshop_dir/$i ]]; do + sleep 0.1s done - else - steam_deck_mods - rc=$? - [[ $rc -eq 1 ]] && return 1 - fi - passed_mod_check > >(zenity --pulsate --progress --auto-close --width=500 2>/dev/null) + done + compare + [[ -z $diff ]] && passed_mod_check > >(zenity --pulsate --progress --auto-close --width=500 2>/dev/null) + + #if [[ $is_steam_deck -eq 0 ]]; then + # open_mod_links + # until [[ -z $diff ]]; do + # zenity --question --title="DZGUI" --ok-label="Next" --cancel-label="Cancel" --text="Opened mod links in browser.\nClick [Next] when all mods have been subscribed to.\nThis dialog may reappear if clicking [Next] too soon\nbefore mods are synchronized in the background." --width=500 2>/dev/null + # rc=$? + # if [[ $rc -eq 0 ]]; then + # compare + # open_mod_links + # else + # return + # fi + # done + #else + # steam_deck_mods + # rc=$? + # [[ $rc -eq 1 ]] && return 1 + #fi + #passed_mod_check > >(zenity --pulsate --progress --auto-close --width=500 2>/dev/null) } encode(){ echo "$1" | md5sum | cut -c -8 diff --git a/helpers/scmd.sh b/helpers/scmd.sh index fdad982..8375011 100644 --- a/helpers/scmd.sh +++ b/helpers/scmd.sh @@ -298,14 +298,12 @@ return_to_dzg(){ cleanup else $(cd $HOME/.local/share/dzgui/helpers; zenity --text-info --html --width=390 --height=452 --filename="d.html" 2>/dev/null) - return 0 + cleanup fi } cleanup(){ tput cnorm - cp $helpers_path/SCMD.log $helpers_path/SCMD.log.bk - grep -v "Logging in user" $helpers_path/SCMD.log.bk > $helpers_path/SCMD.log - rm $helpers_path/SCMD.log.bk + sed -i "s/Logging in user '.*'/Logging in user XXX/" $helpers_path/SCMD.log exit } abort(){