From d44c143846c15ba2032340db085f2ec31365182b Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 10 Aug 2025 14:17:57 +0100 Subject: tree.sh: rename hashtype to hashname since it's the name, e.g. "default", referring to a project tree (in this example, coreboot/default). Signed-off-by: Leah Rowe --- include/tree.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'include/tree.sh') diff --git a/include/tree.sh b/include/tree.sh index e1d43417..ef1e4caa 100644 --- a/include/tree.sh +++ b/include/tree.sh @@ -187,28 +187,28 @@ project_up_to_date() { eval "`setvars "" old_hash hash`" hashdir="$1" - hashtype="$2" + hashname="$2" badhashvar="$3" shift 3 x_ mkdir -p "$XBMK_CACHE/$hashdir" - [ ! -f "$XBMK_CACHE/$hashdir/$project$hashtype" ] || \ - read -r old_hash < "$XBMK_CACHE/$hashdir/$project$hashtype" || \ - err "$hashdir: read err '$XBMK_CACHE/$hashdir/$project$hashtype'" + [ ! -f "$XBMK_CACHE/$hashdir/$project$hashname" ] || \ + read -r old_hash < "$XBMK_CACHE/$hashdir/$project$hashname" || \ + err "$hashdir: read err '$XBMK_CACHE/$hashdir/$project$hashname'" fx_ "x_ sha512sum" find "$@" -type f -not -path "*/.git*/*" | awk \ '{print $1}' > "$xbtmp/tmp.hash" || err "!h $project $hashdir" hash="$(x_ sha512sum "$xbtmp/tmp.hash" | awk '{print $1}' || \ - err)" || err "$hashtype: Can't read sha512 of '$xbtmp/tmp.hash'" + err)" || err "$hashname: Can't read sha512 of '$xbtmp/tmp.hash'" [ "$hash" != "$old_hash" ] && eval "$badhashvar=\"y\"" - [ -f "$XBMK_CACHE/$hashdir/$project$hashtype" ] || \ + [ -f "$XBMK_CACHE/$hashdir/$project$hashname" ] || \ eval "$badhashvar=\"y\"" - printf "%s\n" "$hash" > "$XBMK_CACHE/$hashdir/$project$hashtype" || \ - err "!mk $XBMK_CACHE/$hashdir/$project$hashtype" + printf "%s\n" "$hash" > "$XBMK_CACHE/$hashdir/$project$hashname" || \ + err "!mk $XBMK_CACHE/$hashdir/$project$hashname" eval "[ \"\$$badhashvar\" = \"y\" ] && return 1"; : } -- cgit v1.2.1