]> arthur.barton.de Git - ax-zsh.git/commitdiff
gnupg: It is ok to have gpg2 only (no gpg binary at all)
authorAlexander Barton <alex@barton.de>
Fri, 7 Apr 2017 12:48:01 +0000 (14:48 +0200)
committerAlexander Barton <alex@barton.de>
Fri, 7 Apr 2017 12:48:01 +0000 (14:48 +0200)
When gpp2 is available only, we already create an alias for "gpg" to
it, so it definitely is ok to have no "gpg" binary at all.

plugins/gnupg/gnupg.zshrc

index 694348925bcae10a233723ed5d134bffeeae2a45..431b16a8709f9c6a4c390a318b63062b4401d975 100644 (file)
@@ -9,11 +9,11 @@ if (( $+commands[gpg2] )); then
                # gpg2 is available, but no gpg: alias it!
                alias gpg="gpg2"
        fi
+else
+       # Make sure that "gpg(1)" is available.
+       (( $+commands[gpg] )) || return 1
 fi
 
-# Make sure that "gpg(1)" is available.
-(( $+commands[gpg] )) || return
-
 export GPG_TTY=$(tty)
 
 agent_info_file="$HOME/.gnupg/agent.info-${HOST}"