From d62f4096424e6ce0562a84acb18cc5c1d9aae7a2 Mon Sep 17 00:00:00 2001 From: Levente Polyak Date: Thu, 1 Jul 2021 19:42:29 +0200 Subject: [PATCH] borg: allow out of place calls by prepending the root directory --- misc/borg.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/misc/borg.sh b/misc/borg.sh index 999d40b4..ce569bf0 100755 --- a/misc/borg.sh +++ b/misc/borg.sh @@ -4,6 +4,7 @@ set -eu shopt -s extglob OFFSITE_HOST=ch-s012.rsync.net +ROOT_DIR=$(dirname "${0}")/.. decrypted_gpg=$(mktemp arch-infrastructure-borg-XXXXXXXXX) trap "rm -f \"${decrypted_gpg}\"" EXIT @@ -11,7 +12,7 @@ trap "rm -f \"${decrypted_gpg}\"" EXIT # Find matching key matching_key="" -for gpgkey in borg-keys/!(*-offsite.gpg); do +for gpgkey in "$ROOT_DIR"/borg-keys/!(*-offsite.gpg); do key=$(basename "$gpgkey" .gpg) if [[ "$*" =~ $key ]]; then matching_key="$key" @@ -25,7 +26,7 @@ if [[ -z "$matching_key" ]]; then echo "No matching keyfile found for this host" exit 1 fi -gpg --batch --yes --decrypt -aq --output "$decrypted_gpg" borg-keys/"$matching_key.gpg" +gpg --batch --yes --decrypt -aq --output "$decrypted_gpg" "$ROOT_DIR/borg-keys/$matching_key.gpg" BORG_KEY_FILE="$decrypted_gpg" borg "$@"