aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremmett1 <emmett1.2miligrams@protonmail.com>2025-02-02 14:19:28 +0800
committeremmett1 <emmett1.2miligrams@protonmail.com>2025-02-02 14:19:28 +0800
commit983028a94de29839e1015bd43200079a37e5717e (patch)
treea2f6d52584224ed72756c03f005ec4342277cdb6
parentdcb9c7c05a5fc96e6ad66ee064ddb9b6bd3612b4 (diff)
downloadautils-983028a94de29839e1015bd43200079a37e5717e.tar.gz
autils-983028a94de29839e1015bd43200079a37e5717e.zip
fix package logging & b3sum check
-rwxr-xr-xapkg9
1 files changed, 7 insertions, 2 deletions
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