mirror of
https://github.com/bensuperpc/dockcross.git
synced 2025-01-03 13:44:27 +01:00
Updated gpgconf check to handle gpg versions where gpgconf doesn't exist
This commit is contained in:
parent
68d84d6f06
commit
c1acefed25
@ -34,8 +34,13 @@ curl -o /usr/local/bin/gosu.asc -# -SL $url_key
|
|||||||
gpg --verify /usr/local/bin/gosu.asc
|
gpg --verify /usr/local/bin/gosu.asc
|
||||||
|
|
||||||
# cleanup -- need to kill agent so that there is no race condition for
|
# cleanup -- need to kill agent so that there is no race condition for
|
||||||
# agent files in $GNUPGHOME
|
# agent files in $GNUPGHOME. Only need to do this on newer distros
|
||||||
|
# with gpgconf installed
|
||||||
|
GPGCONF_BIN="$(command -v gpgconf)" || true
|
||||||
|
if [ -n "$GPGCONF" ] && [ -x $GPGCONF_BIN ]; then
|
||||||
gpgconf --kill gpg-agent
|
gpgconf --kill gpg-agent
|
||||||
|
fi
|
||||||
|
|
||||||
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc
|
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc
|
||||||
|
|
||||||
chmod +x /usr/local/bin/gosu
|
chmod +x /usr/local/bin/gosu
|
||||||
|
Loading…
Reference in New Issue
Block a user