summaryrefslogtreecommitdiffstats
path: root/source/ap/slackpkg/files/slackpkg
diff options
context:
space:
mode:
Diffstat (limited to 'source/ap/slackpkg/files/slackpkg')
-rw-r--r--source/ap/slackpkg/files/slackpkg13
1 files changed, 2 insertions, 11 deletions
diff --git a/source/ap/slackpkg/files/slackpkg b/source/ap/slackpkg/files/slackpkg
index 1076ba330..f606574a1 100644
--- a/source/ap/slackpkg/files/slackpkg
+++ b/source/ap/slackpkg/files/slackpkg
@@ -350,17 +350,8 @@ case "$CMD" in
# the key
#
if [ "$UPARG" = "gpg" ] || [ "$GPGFIRSTTIME" = "0" ]; then
- #
- # Creates .gnupg directory if doesn't exist
- # without this dir, gpg got an error.
- #
- if ! [ -e ~/.gnupg ]; then
- mkdir ~/.gnupg
- fi
- getfile ${SOURCE}GPG-KEY $TMPDIR/gpgkey
- gpg --yes --batch --delete-key "$SLACKKEY" &>/dev/null
- gpg --import $TMPDIR/gpgkey &>/dev/null && \
- echo -e "\t\t\tSlackware Linux Project's GPG key added"
+ get_gpg_key && import_gpg_key
+
if [ "$UPARG" = "gpg" ]; then
cleanup
fi