diff options
author | Christian Pointner <equinox@spreadspace.org> | 2020-05-03 04:31:33 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2020-05-03 04:31:33 +0200 |
commit | e586d6beeb43f9b0d8dba5dd3d3be805866b0242 (patch) | |
tree | 773ab7b64cec2182f0ce60326a7412b02b2401c1 /gpg/get-vault-pass.sh | |
parent | move apt-repo/kubernetes out of kubernetes base role (diff) |
gpg: add autodetection for binary
Diffstat (limited to 'gpg/get-vault-pass.sh')
-rwxr-xr-x | gpg/get-vault-pass.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gpg/get-vault-pass.sh b/gpg/get-vault-pass.sh index 6cf2ff9a..5c295fd0 100755 --- a/gpg/get-vault-pass.sh +++ b/gpg/get-vault-pass.sh @@ -6,7 +6,12 @@ fi NAME="$1" shift -gpg2 --decrypt --batch --no-tty --quiet < "${BASH_SOURCE%/*}/vault-pass-$NAME.gpg" +BIN=$(which gpg2) +if [ $? -ne 0 ]; then + BIN=$(which gpg) +fi + +$BIN --decrypt --batch --no-tty --quiet < "${BASH_SOURCE%/*}/vault-pass-$NAME.gpg" # Ansible up to including 2.6 seems to have a bug which ignores the setting of 'vault_id_match = True' # in ansible.cfg (or the equivalent environment variable). |