From 375be95166bd3d9131031d3547d5bcafc541f78d Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 20 May 2022 14:21:07 +0200 Subject: [PATCH] gpg vs gpg2 --- ansible/gpg/get-vault-pass.sh | 8 +++++++- ansible/gpg/gpg2.sh | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ansible/gpg/get-vault-pass.sh b/ansible/gpg/get-vault-pass.sh index 202c94f..d0366e0 100755 --- a/ansible/gpg/get-vault-pass.sh +++ b/ansible/gpg/get-vault-pass.sh @@ -1,2 +1,8 @@ #!/bin/bash -gpg2 --decrypt --batch < "${BASH_SOURCE%/*}/vault-pass.gpg" 2> /dev/null + +BIN=$(which gpg2) +if [ $? -ne 0 ]; then + BIN=$(which gpg) +fi + +$BIN --decrypt --batch < "${BASH_SOURCE%/*}/vault-pass.gpg" 2> /dev/null diff --git a/ansible/gpg/gpg2.sh b/ansible/gpg/gpg2.sh index e67a990..848391c 100755 --- a/ansible/gpg/gpg2.sh +++ b/ansible/gpg/gpg2.sh @@ -1,2 +1,8 @@ #!/bin/bash -exec gpg2 --keyring "${BASH_SOURCE%/*}/vault-keyring.gpg" --secret-keyring /dev/null --no-options --no-default-keyring --trust-model always --keyid-format 0xlong $@ + +BIN=$(which gpg2) +if [ $? -ne 0 ]; then + BIN=$(which gpg) +fi + +exec $BIN --keyring "${BASH_SOURCE%/*}/vault-keyring.gpg" --secret-keyring /dev/null --no-options --no-default-keyring --trust-model always --keyid-format 0xlong $@ -- 1.7.10.4