canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 25.06_branch

25.06_branch
Leah Rowe 2025-05-17 11:09:54 +01:00
parent 1cc56d7dbf 8cb23315d9
commit 98cdecc86b
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/get.sh
View File

@ -84,8 +84,11 @@ xbmkget()
[ "$1" = "curl" ] || [ "$1" = "copy" ] || [ "$1" = "git" ] || \ [ "$1" = "curl" ] || [ "$1" = "copy" ] || [ "$1" = "git" ] || \
err "Bad dlop (arg 1): xbmkget $*" err "Bad dlop (arg 1): xbmkget $*"
echk="f" && [ "$1" = "git" ] && echk="d"
for url in "$2" "$3"; do for url in "$2" "$3"; do
[ -n "$url" ] && try_file "$url" "$@" && return 0 [ -n "$url" ] && try_file "$url" "$@" && \
eval "[ -$echk \"$4\" ] && return 0"
done && err "$1 $2 $3 $4: not downloaded"; : done && err "$1 $2 $3 $4: not downloaded"; :
} }
@ -100,19 +103,20 @@ try_file()
echk="d" && [ "$2" != "git" ] && echk="f" && \ echk="d" && [ "$2" != "git" ] && echk="f" && \
bad_checksum "$6" "$cached" 2>/dev/null && x_ rm -f "$cached" bad_checksum "$6" "$cached" 2>/dev/null && x_ rm -f "$cached"
e "$cached" $echk || try_$2 "$cached" "$@" || return 1 eval "[ -$echk \"$cached\" ] || try_$2 \"\$cached\" \"\$@\" || return 1"
if e "$5" $echk && [ "$2" != "git" ]; then [ "$2" != "git" ] && [ -f "$5" ] && \
bad_checksum "$6" "$5" 2>/dev/null && x_ cp "$cached" "$5" bad_checksum "$6" "$5" 2>/dev/null && x_ cp "$cached" "$5"
fi eval "[ -$echk \"$cached\" ] || return 1"
e "$cached" $echk missing && return 1
if [ "$2" = "git" ]; then if [ "$2" = "git" ]; then
tmpclone "$cached" "$5" "$6" "$7" || return 1 [ -d "$5" ] || tmpclone "$cached" "$5" "$6" "$7" || return 1
else else
bad_checksum "$6" "$cached" && x_ rm -f "$cached" && return 1 bad_checksum "$6" "$cached" && x_ rm -f "$cached" && return 1
[ "$cached" != "$5" ] && x_ cp "$cached" "$5" [ "$cached" != "$5" ] && x_ cp "$cached" "$5"
bad_checksum "$6" "$5" && x_ rm -f "$5" && return 1; : bad_checksum "$6" "$5" && x_ rm -f "$5" && return 1; :
fi fi
eval "[ -$echk \"$5\" ] || return 1"
} }
try_curl() try_curl()
@ -135,7 +139,7 @@ try_git()
x_ rm -Rf "$tmpgitcache" x_ rm -Rf "$tmpgitcache"
[ -d "$gitdest" ] || ( x_ git clone "$2" "$tmpgitcache" ) || return 1 [ -d "$gitdest" ] || ( x_ git clone "$2" "$tmpgitcache" ) || return 1
[ -d "$gitdest" ] || x_ mkdir -p "${gitdest##*/}" [ -d "$gitdest" ] || x_ mkdir -p "${gitdest%/*}"
[ -d "$gitdest" ] || x_ mv "$tmpgitcache" "$gitdest" [ -d "$gitdest" ] || x_ mv "$tmpgitcache" "$gitdest"
( x_ git -C "$gitdest" remote add main "$4" 2>/dev/null ) || : ( x_ git -C "$gitdest" remote add main "$4" 2>/dev/null ) || :
@ -146,15 +150,18 @@ try_git()
bad_checksum() bad_checksum()
{ {
[ ! -f "$2" ] || [ "$(sha512sum "$2" | awk '{print $1}')" != "$1" ] \ [ ! -f "$2" ] && printf "File '%s' missing (sha512sum '%s')\n" \
|| return 1 "$2" "$1" 1>&2 && return 0
printf "Bad checksum for file: %s\n" "$2" 1>&2 fchksum="$(x_ sha512sum "$2" | awk '{print $1}')" || \
err "Can't get sha512sum on '$2' (checking for sha512sum '$1')"
[ "$fchksum" != "$1" ] || return 1
printf "WARNING: BAD checksum for '%s' - expected '%s', got '%s'\n" \
"$2" "$1" "$fchksum" 1>&2
x_ rm -f "$2" x_ rm -f "$2"
} }
tmpclone() tmpclone()
{ {
[ -d "$2" ] && return 0
printf "Creating git clone '%s' from '%s'\n" "$2" "$1" printf "Creating git clone '%s' from '%s'\n" "$2" "$1"
( x_ git clone "$1" "$2" ) || return 1 ( x_ git clone "$1" "$2" ) || return 1
( x_ git -C "$2" reset --hard "$3" ) || return 1 ( x_ git -C "$2" reset --hard "$3" ) || return 1