From 63307abd5227681347b8246b10f9f36800b9bf6a Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:25:51 +0900 Subject: [PATCH 1/7] chore: drop unused var --- helpers/funcs | 1 - 1 file changed, 1 deletion(-) diff --git a/helpers/funcs b/helpers/funcs index c747c82..70e39bb 100755 --- a/helpers/funcs +++ b/helpers/funcs @@ -59,7 +59,6 @@ geo_file="$helpers_path/ips.csv" km_helper="$helpers_path/latlon" sums_path="$helpers_path/sums.md5" query_helper="$helpers_path/query_v2.py" -func_helper="$helpers_path/funcs" lan_helper="$helpers_path/lan" #STEAM PATHS From 08c886210618a9a859161e683643099cfea0afa0 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:26:18 +0900 Subject: [PATCH 2/7] feat: check steam env vars --- helpers/funcs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helpers/funcs b/helpers/funcs index 70e39bb..7e51b3d 100755 --- a/helpers/funcs +++ b/helpers/funcs @@ -1270,7 +1270,7 @@ symlinks(){ link="@$encoded_id" mod="${arr[$i]}" logger INFO "Creating link '$game_dir/$link' for '$workshop_dir/$mod'" - [[ $STEAM_LAUNCH -eq 1 ]] && echo "# Creating mod link $((i+1))/${#arr[@]}" + [[ -n $STEAMSCRIPT ]] && echo "# Creating mod link $((i+1))/${#arr[@]}" ln -s "$workshop_dir/$mod" "$game_dir/$link" done } @@ -1285,7 +1285,7 @@ symlinks(){ if [[ ${#links[@]} -eq 0 ]]; then logger INFO "No symlinks present in '$game_dir', creating them" - if [[ $STEAM_LAUNCH -eq 1 ]]; then + if [[ -n $STEAMSCRIPT ]]; then _create_links "${mods[@]}" > >(_pulse) else _create_links "${mods[@]}" @@ -1303,7 +1303,7 @@ symlinks(){ # update missing targets logger INFO "Found ${#hits[@]} unlinked mods" - if [[ $STEAM_LAUNCH -eq 1 ]]; then + if [[ -n $STEAMSCRIPT ]]; then _create_links "${hits[@]}" > >(_pulse) else _create_links "${hits[@]}" From fc6e8ef001992887871cd8f5bfa97ad2e09f386d Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:26:56 +0900 Subject: [PATCH 3/7] chore: drop unused env var --- dzgui.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dzgui.sh b/dzgui.sh index 5d2d48e..e760506 100755 --- a/dzgui.sh +++ b/dzgui.sh @@ -1007,10 +1007,7 @@ main(){ uninstall && exit 0 fi - if [[ $1 == "--steam" ]] || [[ $1 == "-s" ]]; then - export STEAM_LAUNCH=1 - fi - + set_im_module printf "Initializing setup...\n" From eee65314e8a2fe09dc391ca4425bef8f5323aa98 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:27:22 +0900 Subject: [PATCH 4/7] fix: abstract funcs file path --- dzgui.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dzgui.sh b/dzgui.sh index e760506..694616f 100755 --- a/dzgui.sh +++ b/dzgui.sh @@ -922,14 +922,14 @@ stale_mod_signatures(){ readarray -t old_mod_ids < <(awk -F, '{print $1}' $versions_file) for ((i=0; i<${#old_mod_ids[@]}; ++i)); do if [[ ! -d $workshop_dir/${old_mod_ids[$i]} ]]; then - "$HOME/.local/share/$app_name/helpers/funcs" "align_local" "${old_mod_ids[$i]}" + "$func_helper" "align_local" "${old_mod_ids[$i]}" fi done fi } create_new_links(){ - "$HOME/.local/share/$app_name/helpers/funcs" "update_symlinks" + "$func_helper" "update_symlinks" } initial_setup(){ setup_dirs From eff6450d49d2e9b2c8853adf4d939ec7311dc7b9 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:27:52 +0900 Subject: [PATCH 5/7] chore: update checksum --- dzgui.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dzgui.sh b/dzgui.sh index 694616f..3dfd3cd 100755 --- a/dzgui.sh +++ b/dzgui.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -o pipefail -version=5.7.0-beta.7 +version=5.7.0-beta.8 #CONSTANTS aid=221100 @@ -590,7 +590,7 @@ fetch_helpers_by_sum(){ ["ui.py"]="5a876efacf208d12b5fe761996425412" ["query_v2.py"]="55d339ba02512ac69de288eb3be41067" ["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397" - ["funcs"]="417bd5eaffbefc905a843985c691dc64" + ["funcs"]="3703739856936a5fa11d92a0d2964773" ["lan"]="c62e84ddd1457b71a85ad21da662b9af" ) local author="aclist" From 76e8640476514bcd9f29dcf4928eb5da0127d473 Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:28:44 +0900 Subject: [PATCH 6/7] docs: update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 332a41e..a13e5f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [5.7.0-beta.8] 2024-02-10 +## Changed +- Drop launch flag and check for invocation through Steam automatically + ## [5.7.0-beta.7] 2024-02-09 ## Changed - Update IP database records for 2025-02 From aaaf653c57df1d137fd1b7626aeefe87f84b51ed Mon Sep 17 00:00:00 2001 From: aclist <92275929+aclist@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:31:29 +0900 Subject: [PATCH 7/7] docs: update URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 553e72e..607f7dd 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ This overcomes certain limitations in the Linux client and helps prepare the gam Refer to the documentation for installation and setup instructions: -- [GitHub](https://aclist.github.io/dzgui/dzgui.html) +- [GitHub](https://aclist.github.io/dzgui/index.html) - [Mirror (Codeberg)](https://aclist.codeberg.page)