From e586d6beeb43f9b0d8dba5dd3d3be805866b0242 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 3 May 2020 04:31:33 +0200
Subject: gpg: add autodetection for binary

---
 gpg/get-vault-pass.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'gpg/get-vault-pass.sh')

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).
-- 
cgit v1.2.3