Merge branch 'master' into 25.06_branch25.06_branch

1 files changed, 4 insertions, 18 deletions

diff --git a/include/get.sh b/include/get.sh
index c6c6b75b..667ab398 100644
--- a/include/get.sh
+++ b/include/get.sh
@@ -15,7 +15,6 @@ fetch_targets()
 	printf "Creating %s tree %s\n" "$project" "$tree"
 	git_prep "$url" "$bkup_url" "$xbmkpwd/$configdir/$tree/patches" \
 	    "src/$project/$tree" with_submodules
-	( fx_ nuke find "$xbmkpwd/config" -type f -name "nuke.list" ) || exit 1
 }
 
 fetch_project()
@@ -31,7 +30,6 @@ fetch_project()
 		x_ ./mk -f $d
 	done
 	clone_project
-	( fx_ nuke find "$xbmkpwd/config" -type f -name "nuke.list" ) || exit 1
 }
 
 clone_project()
@@ -150,27 +148,15 @@ try_git()
 
 bad_checksum()
 {
-	[ ! -f "$2" ] && printf "File '%s' missing (sha512sum '%s')\n" \
-	    "$2" "$1" 1>&2 && return 0
-	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"
+	[ ! -f "$2" ] && printf "'%s' missing, %s\n" "$2" "$1" 1>&2 && return 0
+	csum="$(x_ sha512sum "$2" | awk '{print $1}')" || err "!sha512 '$2' $1"
+	[ "$csum" != "$1" ] && printf "BAD SHA512, '%s'; need '%s', got %s\n" \
+	    "$2" "$1" "$csum" 1>&2 && x_ rm -f "$2" && return 0; return 1
 }
 
 tmpclone()
 {
-	printf "Creating git clone '%s' from '%s'\n" "$2" "$1"
 	( x_ git clone "$1" "$2" ) || return 1
 	( x_ git -C "$2" reset --hard "$3" ) || return 1
 	( fx_ "eval x_ git -C \"$2\" am" find "$4" -type f ) || return 1; :
 }
-
-nuke()
-{
-	rdir="${1#"$xbmkpwd/config/"}" && [ -d "$xbmkpwd/src/${rdir%/*}" ] && \
-	    x_ cd "$xbmkpwd/src/${rdir%/*}" && \
-	    dx_ "eval [ -L \"\$fx\" ] || x_ rm -Rf" "$1"; :
-}