From 209e4038327c1a704a00629836a6830f6ff82e7d Mon Sep 17 00:00:00 2001
From: Knut Ahlers <knut@ahlers.me>
Date: Fri, 16 Sep 2016 20:17:01 +0200
Subject: [PATCH] Fix vault-gpg and backup

---
 bin/backup    | 4 +++-
 bin/vault-gpg | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/backup b/bin/backup
index 099fa21..339e446 100755
--- a/bin/backup
+++ b/bin/backup
@@ -3,5 +3,7 @@
 CMD=${1:-backup}
 HOSTNAME=$(hostname -s)
 
+shift
+
 exec vault2env /secret/private/duplicity/${HOSTNAME} -- \
-  duplicity-backup -f ${HOME}/.duplicity/${HOSTNAME}.yaml ${CMD}
+  duplicity-backup -f ${HOME}/.duplicity/${HOSTNAME}.yaml ${CMD} "$@"
diff --git a/bin/vault-gpg b/bin/vault-gpg
index 38458ec..e383445 100755
--- a/bin/vault-gpg
+++ b/bin/vault-gpg
@@ -2,7 +2,7 @@
 
 KEY=$1
 
-if [ -z "${KEY}" ] || ! (gpg --list-secret-keys | grep -q ${KEY}); then
+if [ -z "${KEY}" ] || ! (gpg2 --list-secret-keys | grep -q ${KEY}); then
   echo "No key given or no secret key found for '${KEY}'"
   exit 2
 fi