diff options
Diffstat (limited to 'source/ap/slackpkg/files/core-functions.sh')
| -rw-r--r-- | source/ap/slackpkg/files/core-functions.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/ap/slackpkg/files/core-functions.sh b/source/ap/slackpkg/files/core-functions.sh index 824547867..ede3d3f42 100644 --- a/source/ap/slackpkg/files/core-functions.sh +++ b/source/ap/slackpkg/files/core-functions.sh @@ -371,11 +371,11 @@ as slackpkg cannot function without awk.\n" # Check if gpg is enabled but no GPG command are found. # - if ! [ "$(which gpg 2>/dev/null)" ] && [ "${CHECKGPG}" = "on" ]; then + if ! [ "$(which gpg2 2>/dev/null)" ] && [ "${CHECKGPG}" = "on" ]; then CHECKGPG=off echo -e "\n\ gpg package not found! Please disable GPG in ${CONF}/slackpkg.conf or install\n\ -the gnupg package.\n\n\ +the gnupg2 package.\n\n\ To disable GPG, edit slackpkg.conf and change the value of the CHECKGPG \n\ variable to "off" - you can see an example in the original slackpkg.conf.new\n\ file distributed with slackpkg.\n" @@ -384,7 +384,7 @@ file distributed with slackpkg.\n" # Check if the Slackware GPG key are found in the system # - GPGFIRSTTIME="$(gpg --list-keys \"$SLACKKEY\" 2>/dev/null \ + GPGFIRSTTIME="$(gpg2 --list-keys \"$SLACKKEY\" 2>/dev/null \ | grep -c "$SLACKKEY")" if [ "$GPGFIRSTTIME" = "0" ] && \ [ "$CMD" != "search" ] && \ @@ -546,7 +546,7 @@ function checkmd5() { # Verify the GPG signature of files/packages # function checkgpg() { - gpg --verify ${1}.asc ${1} 2>/dev/null && echo "1" || echo "0" + gpg2 --verify ${1}.asc ${1} 2>/dev/null && echo "1" || echo "0" } # Fetch $SLACKKEY from a trusted source @@ -585,8 +585,8 @@ Do you want to import the GPG key from this source? (YES|NO)\n" # Import $SLACKKEY function import_gpg_key() { mkdir -p ~/.gnupg - gpg --yes --batch --delete-key "$SLACKKEY" &>/dev/null - gpg --import $TMPDIR/gpgkey &>/dev/null && \ + gpg2 --yes --batch --delete-key "$SLACKKEY" &>/dev/null + gpg2 --import $TMPDIR/gpgkey &>/dev/null && \ echo -e "\t\t\tSlackware Linux Project's GPG key added" } @@ -1133,7 +1133,7 @@ Please check your mirror and try again." rm $TMPDIR/CHECKSUMS.md5 rm $TMPDIR/CHECKSUMS.md5.asc echo -e "\ -\n\t\tERROR: Verification of the gpg signature on CHECKSUMS.md5\n\ +\n\t\tERROR: Verification of the gpg signature on CHECKSUMS.md5\n\ \t\t failed! This could mean that the file is out of date\n\ \t\t or has been tampered with. If you use mirrors.slackware.com\n\ \t\t as your mirror, this could also mean that the mirror to\n\ |