From 3442f4278ed8536215125ade04a754b99bc24fde Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 18 Apr 2025 00:23:32 +0100 Subject: mk: simplify check_project_hashes() Signed-off-by: Leah Rowe --- mk | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'mk') diff --git a/mk b/mk index 9f4da41b..96d762a2 100755 --- a/mk +++ b/mk @@ -292,23 +292,19 @@ build_dependencies() check_project_hashes() { - x_ mkdir -p "$XBMK_CACHE/hash" - old_pjhash="" + old_pjhash="" && x_ mkdir -p "$XBMK_CACHE/hash" [ ! -f "$XBMK_CACHE/hash/$project$tree" ] || \ read -r old_pjhash < "$XBMK_CACHE/hash/$project$tree" x_ rm -f "$xbmktmp/project.list" "$xbmktmp/project.hash" \ "$xbmktmp/project.tmp" - x_ touch "$xbmktmp/project.tmp" - x_ touch "$xbmktmp/project.hash" + x_ touch "$xbmktmp/project.tmp" "$xbmktmp/project.hash" for rmchk in "$datadir" "$configdir/$tree" "$mdir"; do - [ -d "$rmchk" ] || continue - find "$rmchk" -type f -not -path "*/.git*/*" >> \ - "$xbmktmp/project.tmp" || $err "!find $rmchk > project.tmp" + [ ! -d "$rmchk" ] || find "$rmchk" -type f -not -path \ + "*/.git*/*" >> "$xbmktmp/project.tmp" || $err "!fh $rmchk" done - sort "$xbmktmp/project.tmp" > "$xbmktmp/project.list" || \ - $err "!sort project tmp/list" + sort "$xbmktmp/project.tmp" > "$xbmktmp/project.list" || $err "!pj srt" while read -r rmchk; do [ ! -f "$rmchk" ] || x_ sha512sum "$rmchk" | awk \ -- cgit v1.2.1