CHANGELOG.md

@@ -1,14 +1,6 @@
 # Changelog
 
-
-## [5.7.0-beta.3] 2024-01-10
-## Changed
-- Support legacy jq syntax for Ubuntu variants
-## Fixed
-- Stricter redacting of usernames (again)
-
 ## [5.7.0-beta.2] 2024-01-07
-## Fixed
 - Stricter redacting of usernames
 - Omit nested directories when traversing symlinks
 

dzgui.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -o pipefail
 
-version=5.7.0-beta.5
+version=5.7.0-beta.2
 
 #CONSTANTS
 aid=221100
@@ -77,7 +77,7 @@ set_im_module(){
     fi
 }
 redact(){
-    sed 's@\(/home/\)[^/]*@\1REDACTED@g'
+    sed 's@\(/home/\)\([^/]*\)\(.*\)@\1REDACTED\3@g'
 }
 logger(){
     local date="$(date "+%F %T,%3N")"
@@ -590,7 +590,7 @@ fetch_helpers_by_sum(){
         ["ui.py"]="d3ad9153d8599bea0eede9fd3121ee8e"
         ["query_v2.py"]="55d339ba02512ac69de288eb3be41067"
         ["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
-        ["funcs"]="6a1c7ce585d9b76e2e75dba9d4295f8d"
+        ["funcs"]="3dc91b7effed4c9493ddba488fe8d9ff"
         ["lan"]="c62e84ddd1457b71a85ad21da662b9af"
     )
     local author="aclist"
@@ -940,7 +940,7 @@ initial_setup(){
     watcher_deps
     check_architecture
     test_connection
-    fetch_helpers > >(pdialog "Checking helper files")
+#    fetch_helpers > >(pdialog "Checking helper files")
     varcheck
     source "$config_file"
     lock

helpers/funcs

@@ -447,9 +447,7 @@ get_remote_servers(){
         _fetch "${params[$i]}" > $_cache_temp.${i}
     done
 
-    # ubuntu variants do not support jq 1.7 chained operators
-    # https://github.com/jqlang/jq/releases/tag/jq-1.7
-    jq -n '[ [inputs]|add ][]' $_cache_temp.* && rm $_cache_temp.*
+    jq -n '[ [inputs]|add ].[]' $_cache_temp.* && rm $_cache_temp.*
 }
 get_unique_maps(){
     shift
@@ -738,7 +736,7 @@ dump_servers(){
     filter_servers "$file" "$@"
 }
 redact(){
-    sed 's@\(/home/\)[^/]*@\1REDACTED@g'
+    sed 's@\(/home/\)\([^/]*\)\(.*\)@\1REDACTED\3@g'
 }
 logger(){
     local date="$(date "+%F %T,%3N")"