Compare commits

..

2 Commits

Author SHA1 Message Date
aclist
252f07cbec
Merge pull request #287 from aclist/prerelease/6.0.6-beta.1
Some checks failed
Mirror to Codeberg / mirror-to-codeberg (push) Has been cancelled
chore: update symlink hash logic
2026-05-17 23:42:18 +09:00
aclist
a0f610ead7 chore: update symlink hash logic 2026-05-17 23:40:35 +09:00
3 changed files with 24 additions and 7 deletions

View File

@ -1,5 +1,10 @@
# 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.5-beta.2 version=6.0.6-beta.1
#CONSTANTS #CONSTANTS
aid=221100 aid=221100
@ -567,9 +567,12 @@ get_hash(){
md5sum "$1" | awk '{print $1}' md5sum "$1" | awk '{print $1}'
} }
fetch_a2s(){ fetch_a2s(){
# this file is currently monolithic sum="d26da2fe03df2b95436f823f0496887b"
[[ -d $helpers_path/a2s ]] && { logger INFO "A2S helper is current"; return 0; } if [[ -d $helpers_path/a2s ]] && [[ $(get_hash "$helpers_path/a2s/info.py") == $sum ]]; then
local sha=c7590ffa9a6d0c6912e17ceeab15b832a1090640 logger INFO "A2S helper is current"
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"
@ -626,7 +629,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"]="2e1b0e6693258fe8b4bf23d9b6431d7f" ["funcs"]="1cd26343cd68a5382e3377a9757497fa"
["query_v2.py"]="55d339ba02512ac69de288eb3be41067" ["query_v2.py"]="55d339ba02512ac69de288eb3be41067"
["servers.py"]="ed442c3aecf33f777d59dcf53650d263" ["servers.py"]="ed442c3aecf33f777d59dcf53650d263"
["ui.py"]="cf52a3d5883afe02a013d8673df494fa" ["ui.py"]="cf52a3d5883afe02a013d8673df494fa"

View File

@ -930,13 +930,19 @@ query_defunct(){
<<< "$result" awk '{print $2}' <<< "$result" awk '{print $2}'
} }
encode(){ encode(){
echo "$1" | md5sum | cut -c -8 echo -n "$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"
@ -1027,7 +1033,10 @@ update_symlinks(){
if [[ ! -d "$workshop_dir" ]]; then if [[ ! -d "$workshop_dir" ]]; then
return return
fi fi
legacy_symlinks if [[ ! -d "$game_dir" ]]; then
return
fi
unlink_all
symlinks symlinks
} }
try_fallback(){ try_fallback(){