1
0
Fork 0
mirror of https://github.com/aclist/dztui.git synced 2025-03-15 00:43:01 +01:00

fix: jq 1.6 support (#192)

This commit is contained in:
aclist 2025-01-10 22:38:20 +09:00
parent 0dc339893b
commit 5a292b37c4
3 changed files with 14 additions and 4 deletions

View file

@ -1,6 +1,14 @@
# Changelog # 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 ## [5.7.0-beta.2] 2024-01-07
## Fixed
- Stricter redacting of usernames - Stricter redacting of usernames
- Omit nested directories when traversing symlinks - Omit nested directories when traversing symlinks

View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -o pipefail set -o pipefail
version=5.7.0-beta.2 version=5.7.0-beta.3
#CONSTANTS #CONSTANTS
aid=221100 aid=221100
@ -590,7 +590,7 @@ fetch_helpers_by_sum(){
["ui.py"]="d3ad9153d8599bea0eede9fd3121ee8e" ["ui.py"]="d3ad9153d8599bea0eede9fd3121ee8e"
["query_v2.py"]="55d339ba02512ac69de288eb3be41067" ["query_v2.py"]="55d339ba02512ac69de288eb3be41067"
["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397" ["vdf2json.py"]="2f49f6f5d3af919bebaab2e9c220f397"
["funcs"]="3dc91b7effed4c9493ddba488fe8d9ff" ["funcs"]="6a1c7ce585d9b76e2e75dba9d4295f8d"
["lan"]="c62e84ddd1457b71a85ad21da662b9af" ["lan"]="c62e84ddd1457b71a85ad21da662b9af"
) )
local author="aclist" local author="aclist"

View file

@ -447,7 +447,9 @@ get_remote_servers(){
_fetch "${params[$i]}" > $_cache_temp.${i} _fetch "${params[$i]}" > $_cache_temp.${i}
done done
jq -n '[ [inputs]|add ].[]' $_cache_temp.* && rm $_cache_temp.* # 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.*
} }
get_unique_maps(){ get_unique_maps(){
shift shift
@ -736,7 +738,7 @@ dump_servers(){
filter_servers "$file" "$@" filter_servers "$file" "$@"
} }
redact(){ redact(){
sed 's@\(/home/\)\([^/]*\)\(.*\)@\1REDACTED\3@g' sed 's@\(/home/\)[^/]*@\1REDACTED@g'
} }
logger(){ logger(){
local date="$(date "+%F %T,%3N")" local date="$(date "+%F %T,%3N")"