From: Christian Pointner <equinox@realraum.at>
Date: Fri, 20 May 2022 12:21:07 +0000 (+0200)
Subject: gpg vs gpg2
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=375be95166bd3d9131031d3547d5bcafc541f78d;p=noc.git

gpg vs gpg2
---

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 $@