diff options
| author | Robby Workman <rworkman@slackware.com> | 2021-05-31 11:49:52 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackware.com> | 2021-06-04 22:23:27 -0500 |
| commit | 3c4c175de873a3ac5599da454bb693d2d5719811 (patch) | |
| tree | a0e98cfd99c30ed8e20e55ee9a2c44b8a3e7326a /files/slackpkg | |
| parent | c43af13723c0cc2ada7f6542c73449c757799ce3 (diff) | |
| download | slackpkg-3c4c175de873a3ac5599da454bb693d2d5719811.tar.xz | |
Harden slackpkg with respect to obtaining GPG key
Co-authored-by: CRTS <crts@gmx.net>
Reviewed-by: Piter PUNK <piterpunk@slackware.com>
Diffstat (limited to 'files/slackpkg')
| -rw-r--r-- | files/slackpkg | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/files/slackpkg b/files/slackpkg index 1076ba3..f606574 100644 --- a/files/slackpkg +++ b/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 |