From 983028a94de29839e1015bd43200079a37e5717e Mon Sep 17 00:00:00 2001
From: emmett1 <emmett1.2miligrams@protonmail.com>
Date: Sun, 2 Feb 2025 14:19:28 +0800
Subject: fix package logging & b3sum check

---
 apkg | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'apkg')

diff --git a/apkg b/apkg
index 593cb3e..e888483 100755
--- a/apkg
+++ b/apkg
@@ -669,6 +669,7 @@ checksum_src() {
 	if [ ! -s "$checksum_file" ]; then
 		gencsum
 	else
+		b3sumcheck || return 0
 		printcsum > ${checksum_file}.tmp
 		diff -U 0 ${checksum_file} ${checksum_file}.tmp | \
 			sed '/---/d;/+++/d;/@@/d' | \
@@ -711,9 +712,13 @@ checksource() {
 	[ "$failed" ] && ret 1
 }
 
+b3sumcheck() {
+	command -v b3sum >/dev/null || { msg "'b3sum' not installed."; return 1; }
+}
+
 gencsum() {
 	checksource
-	command -v b3sum >/dev/null || { msg "'b3sum' not installed."; return 0; }
+	b3sumcheck || return 0
 	rm -f .checksum
 	printcsum > .checksum
 	msg "Checksum file updated."
@@ -842,7 +847,7 @@ main() {
 	parseopts "$@"
 	set -- $(updateopts "$@")
 	
-	for d in $APKG_PACKAGE_DIR $APKG_SOURCE_DIR $APKG_WORK_DIR APKG_LOG_DIR; do
+	for d in $APKG_PACKAGE_DIR $APKG_SOURCE_DIR $APKG_WORK_DIR $APKG_LOG_DIR; do
 		[ -d "$d" ] || { msg "Directory '$d' not exist"; exit 1; }
 		[ -w "$d" ] || { msg "Directory '$d' dont have write access"; exit 1; }
 	done
-- 
cgit v1.2.3