Compare commits

..

No commits in common. "252f07cbec77d440f1cfee8b1aa3b23e290a05e1" and "ca4bcfc1a505f52c3ed1aeb328e849e85d04ad17" have entirely different histories.

3 changed files with 7 additions and 24 deletions

View File

@ -1,10 +1,5 @@
# Changelog # Changelog
## [6.0.6-beta.1] 2026-05-17
## Changed
- Update symlink hash logic to align with DZGUI 7 beta
- Update A2S helper to latest commit
## [6.0.5-beta.2] 2026-04-17 ## [6.0.5-beta.2] 2026-04-17
## Changed ## Changed
- During server connection attempts, only download mods local to specific server - During server connection attempts, only download mods local to specific server

View File

@ -2,7 +2,7 @@
set -o pipefail set -o pipefail
src_path="$(readlink -e "$0")" src_path="$(readlink -e "$0")"
version=6.0.6-beta.1 version=6.0.5-beta.2
#CONSTANTS #CONSTANTS
aid=221100 aid=221100
@ -567,12 +567,9 @@ get_hash(){
md5sum "$1" | awk '{print $1}' md5sum "$1" | awk '{print $1}'
} }
fetch_a2s(){ fetch_a2s(){
sum="d26da2fe03df2b95436f823f0496887b" # this file is currently monolithic
if [[ -d $helpers_path/a2s ]] && [[ $(get_hash "$helpers_path/a2s/info.py") == $sum ]]; then [[ -d $helpers_path/a2s ]] && { logger INFO "A2S helper is current"; return 0; }
logger INFO "A2S helper is current" local sha=c7590ffa9a6d0c6912e17ceeab15b832a1090640
return 0
fi
local sha=b40eb24cdbb06ebd08272f224257fe5a81610e86
local author="yepoleb" local author="yepoleb"
local repo="python-a2s" local repo="python-a2s"
local url="https://github.com/$author/$repo/tarball/$sha" local url="https://github.com/$author/$repo/tarball/$sha"
@ -629,7 +626,7 @@ fetch_helpers_by_sum(){
[[ -f "$config_file" ]] && source "$config_file" [[ -f "$config_file" ]] && source "$config_file"
declare -A sums declare -A sums
sums=( sums=(
["funcs"]="1cd26343cd68a5382e3377a9757497fa" ["funcs"]="2e1b0e6693258fe8b4bf23d9b6431d7f"
["query_v2.py"]="55d339ba02512ac69de288eb3be41067" ["query_v2.py"]="55d339ba02512ac69de288eb3be41067"
["servers.py"]="ed442c3aecf33f777d59dcf53650d263" ["servers.py"]="ed442c3aecf33f777d59dcf53650d263"
["ui.py"]="cf52a3d5883afe02a013d8673df494fa" ["ui.py"]="cf52a3d5883afe02a013d8673df494fa"

View File

@ -930,19 +930,13 @@ query_defunct(){
<<< "$result" awk '{print $2}' <<< "$result" awk '{print $2}'
} }
encode(){ encode(){
echo -n "$1" | md5sum | cut -c -8 echo "$1" | md5sum | cut -c -8
} }
compare(){ compare(){
local modlist="$@" local modlist="$@"
diff=$(comm -23 <(<<< "$modlist" sort -u) <(installed_mods | sort)) diff=$(comm -23 <(<<< "$modlist" sort -u) <(installed_mods | sort))
echo "$diff" echo "$diff"
} }
unlink_all(){
readarray -t links < <(find "$game_dir" -maxdepth 1 -mindepth 1 -type l)
for link in "${links[@]}"; do
unlink "$link"
done
}
legacy_symlinks(){ legacy_symlinks(){
logger INFO "Removing legacy symlinks" logger INFO "Removing legacy symlinks"
@ -1033,10 +1027,7 @@ update_symlinks(){
if [[ ! -d "$workshop_dir" ]]; then if [[ ! -d "$workshop_dir" ]]; then
return return
fi fi
if [[ ! -d "$game_dir" ]]; then legacy_symlinks
return
fi
unlink_all
symlinks symlinks
} }
try_fallback(){ try_fallback(){