Merge pull request #202 from aclist/chore/backports

chore: backports

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## [5.6.6] 2024-02-09
+## [5.6.4] 2024-02-10
+### Changed
+- Drop launch flag and check for invocation through Steam automatically
+
+## [5.6.3] 2024-02-09
 ### Changed
 - Update IP database records for 2025-02
 

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)
 
 

dzgui.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -o pipefail
 
-version=5.6.3
+version=5.6.4
 
 #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"
@@ -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
@@ -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"

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
@@ -1271,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
     }
@@ -1286,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[@]}"
@@ -1304,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[@]}"