Skip to content

Commit d8e40f6

Browse files
authored
Use coreutils checksum tools instead of shasum (#2131)
1 parent 416ad6f commit d8e40f6

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

APP-MANAGER

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
AMVERSION="9.9.5"
3+
AMVERSION="9.9.5-1"
44

55
# Determine main repository and branch
66
AMREPO="https://raw.githubusercontent.com/ivan-hc/AM/main"
@@ -1409,7 +1409,7 @@ _use_sync() {
14091409

14101410
_use_verify() {
14111411
# Check if checksum calc tools exist
1412-
if command -v shasum &> /dev/null && command -v md5sum &> /dev/null; then
1412+
if command -v sha1sum &>/dev/null && command -v sha256sum &>/dev/null && command -v sha512sum &>/dev/null && command -v md5sum &>/dev/null; then
14131413
# Check if the download was a tarball/zip file
14141414
if { [ -f "$argpath/version" ] && grep -q '\.xz$\|\.zip$\|\.gz$' "$argpath/version"; } \
14151415
|| { [ -f "$argpath/AM-updater" ] && grep -q 'wget.*\.xz \|wget.*\.zip \|wget.*\.gz ' "$argpath/AM-updater"; } \
@@ -1450,15 +1450,15 @@ _use_verify() {
14501450
# Calculate checksums and remove verified status
14511451
if [ -f "$argpath"/"$arg" ]; then
14521452
rm -f "$argpath"/AM-VERIFIED
1453-
checksum_sha1=$(shasum -a 1 "$argpath/$arg" | awk '{print $1}')
1454-
checksum_sha256=$(shasum -a 256 "$argpath/$arg" | awk '{print $1}')
1455-
checksum_sha512=$(shasum -a 512 "$argpath/$arg" | awk '{print $1}')
1453+
checksum_sha1=$(sha1sum "$argpath/$arg" | awk '{print $1}')
1454+
checksum_sha256=$(sha256sum "$argpath/$arg" | awk '{print $1}')
1455+
checksum_sha512=$(sha512sum "$argpath/$arg" | awk '{print $1}')
14561456
checksum_md5=$(md5sum "$argpath/$arg" | awk '{print $1}')
14571457
elif [ -f "$argpath"/"$pure_arg" ]; then
14581458
rm -f "$argpath"/AM-VERIFIED
1459-
checksum_sha1=$(shasum -a 1 "$argpath/$pure_arg" | awk '{print $1}')
1460-
checksum_sha256=$(shasum -a 256 "$argpath/$pure_arg" | awk '{print $1}')
1461-
checksum_sha512=$(shasum -a 512 "$argpath/$pure_arg" | awk '{print $1}')
1459+
checksum_sha1=$(sha1sum "$argpath/$pure_arg" | awk '{print $1}')
1460+
checksum_sha256=$(sha256sum "$argpath/$pure_arg" | awk '{print $1}')
1461+
checksum_sha512=$(sha512sum "$argpath/$pure_arg" | awk '{print $1}')
14621462
checksum_md5=$(md5sum "$argpath/$pure_arg" | awk '{print $1}')
14631463
else
14641464
checksum_msg=$(echo $"Checksum cannot be verified, mismatch in binary name.")
@@ -1476,7 +1476,7 @@ _use_verify() {
14761476
printf "MD5: %b\nSHA1: %b\nSHA256: %b\nSHA512: %b" "$checksum_sha1" "$checksum_sha256" "$checksum_sha512" "$checksum_md5" > "$argpath"/AM-VERIFIED
14771477
fi
14781478
else
1479-
echo $"Checksum calculation tools do not exist, please install shasum/md5sum."
1479+
echo $"Checksum calculation tools do not exist, please install coreutils." | sed 's/coreutils/"coreutils"/g'
14801480
fi
14811481
unset checksum_sha1 checksum_sha256 checksum_sha512 checksum_md5 digest download_url results
14821482
}

0 commit comments

Comments
 (0)