chore: backports

CHANGELOG.md

@@ -1,11 +1,16 @@
 # Changelog
 
+## [5.2.4] 2024-05-29
+### Fixed
+- Resolved an issue that could cause an old path to a prior DayZ installation to be reinserted in the config file if the Steam client did not synch the new path internally. DZGUI would try to ask the user to re-run first-time setup and update the path, but the old path would still be used.
+
 ## [5.2.3] 2024-04-19
 ### Added
 - Added Debug Mode button to main menu
 
 ### Changed
 - Reworded debug mode notification dialog
+- Updated geolocation records
 
 ### Dropped
 - Dropped seen_news key from configs

README.md

@@ -17,3 +17,7 @@ Other options include the ability to connect by IP or ID or  set a favorite serv
 Refer to the [manual](https://aclist.github.io/dzgui/dzgui.html) for installation and setup instructions, a feature-by-feature breakdown, and Steam integration tutorials.
 
 ![Alt text](/images/example.png)
+
+## Attribution
+
+Geolocation records from [DB-IP](https://db-ip.com) under [CC 4.0 license](https://creativecommons.org/licenses/by/4.0/)

docs/dzgui.adoc

@@ -46,11 +46,12 @@ curl -s "https://raw.githubusercontent.com/aclist/dztui/dzgui/install.sh" | bash
 Follow the instructions at https://github.com/lelgenio/dzgui-nix to ingest the package and dependencies
 into your system using flakes. 
 
-Manual method
+**Manual method**
 
 ```
 git clone https://github.com/aclist/dztui.git
 chmod +x dzgui.sh
+./dzgui.sh
 ```
 
 ==== Step 2: update the vm.max_map_count value
@@ -284,6 +285,18 @@ $HOME/.config/dztui/dztuirc.old
 
 ```
 
+=== Locale support
+
+For internationalization purposes, DZGUI will inherit the default locale setting on the system when displaying numbers. This is used for thousands separators in long numbers and decimal separators in fractional numbers.
+
+If you wish to use a specific regional numbering preference while retaining a different base system language (e.g., English language with German-style numbering), pass the desired locale as a variable before launching DZGUI:
+
+```
+LC_ALL=de_DE.UTF-8 ./dzgui.sh
+```
+
+If you intend to use this frequently, you could wrap the above in a script or alias.
+
 == Basic usage
 Select from among the <<Menu contexts and options>> below.
 

docs/dzgui_dark.adoc

@@ -46,11 +46,12 @@ curl -s "https://raw.githubusercontent.com/aclist/dztui/dzgui/install.sh" | bash
 Follow the instructions at https://github.com/lelgenio/dzgui-nix to ingest the package and dependencies
 into your system using flakes. 
 
-Manual method
+**Manual method**
 
 ```
 git clone https://github.com/aclist/dztui.git
 chmod +x dzgui.sh
+./dzgui.sh
 ```
 
 ==== Step 2: update the vm.max_map_count value
@@ -284,6 +285,18 @@ $HOME/.config/dztui/dztuirc.old
 
 ```
 
+=== Locale support
+
+For internationalization purposes, DZGUI will inherit the default locale setting on the system when displaying numbers. This is used for thousands separators in long numbers and decimal separators in fractional numbers.
+
+If you wish to use a specific regional numbering preference while retaining a different base system language (e.g., English language with German-style numbering), pass the desired locale as a variable before launching DZGUI:
+
+```
+LC_ALL=de_DE.UTF-8 ./dzgui.sh
+```
+
+If you intend to use this frequently, you could wrap the above in a script or alias.
+
 == Basic usage
 Select from among the <<Menu contexts and options>> below.
 

dzgui.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -o pipefail
 
-version=5.2.3-rc.2
+version=5.2.5-rc.1
 
 #CONSTANTS
 aid=221100
@@ -533,10 +533,10 @@ fetch_helpers_by_sum(){
     source "$config_file"
     declare -A sums
     sums=(
-        ["ui.py"]="9eeff067994b1e8010eb37f1db1b34bc"
+        ["ui.py"]="1e692d9c658aba4402c1c998263f6184"
         ["query_v2.py"]="1822bd1769ce7d7cb0d686a60f9fa197"
         ["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
-        ["funcs"]="6fe6e3ff99237c77ef855a51420c51f0"
+        ["funcs"]="47ba5f1b5da5d1e7f42a5a088b29ec9d"
     )
     local author="aclist"
     local repo="dztui"
@@ -688,6 +688,11 @@ find_library_folder(){
     logger INFO "Steam path resolved to: $steam_path"
 }
 create_config(){
+    #if old path is malformed and this function is forcibly called,
+    #wipe paths from memory before entering the loop to force path rediscovery
+    unset default_steam_path
+    unset steam_path
+
     while true; do
         local player_input="$($steamsafe_zenity \
             --forms \
@@ -698,8 +703,7 @@ create_config(){
             --text="DZGUI" $sd_res \
             --separator="@")"
         #explicitly setting IFS crashes $steamsafe_zenity in loop
-        #and mapfile does not support high ascii delimiters
-        #so split fields with newline
+        #and mapfile does not support high ascii delimiters, so split fields with newline
         readarray -t args < <(<<< "$player_input" sed 's/@/\n/g')
         name="${args[0]}"
         steam_api="${args[1]}"
@@ -730,7 +734,7 @@ create_config(){
             find_library_folder "$default_steam_path"
             if [[ -z $steam_path ]]; then
                 logger raise_error "Steam path was empty"
-                zenity --question --text="DayZ not found or not installed at the chosen path." --ok-label="Choose path manually" --cancel-label="Exit"
+                zenity --question --text="DayZ not found or not installed at the Steam library given." --ok-label="Choose path manually" --cancel-label="Exit"
                 if [[ $? -eq 0 ]]; then
                     logger INFO "User selected file picker"
                     file_picker

helpers/funcs

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -o pipefail
-version=5.2.3.rc-1
+version=5.2.3
 
 #CONSTANTS
 aid=221100

helpers/ui.py

@@ -18,7 +18,7 @@ locale.setlocale(locale.LC_ALL, '')
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, GLib, Gdk, GObject, Pango
 
-# 5.2.3.rc-1
+# 5.2.3
 app_name = "DZGUI"
 
 start_time = 0