From 8c68c6060255549a18ba0e87ce1e29acdaf38080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Sat, 13 Apr 2019 22:10:45 +0200 Subject: [PATCH] Handle project root correctly --- backup.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/backup.sh b/backup.sh index 66cb35a..9eb1e19 100755 --- a/backup.sh +++ b/backup.sh @@ -4,13 +4,15 @@ set -o nounset set -o errexit set -o xtrace -if [[ ! -e ./venv ]] ; then - python3 -m venv venv -fi -source ./venv/bin/activate -command -v aws || pip install -r ./requirements.txt +dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -export GNUPGHOME=./gpghome +if [[ ! -e "${dir}/venv" ]] ; then + python3 -m venv "${dir}/venv" +fi +source "${dir}/venv/bin/activate" +command -v aws || pip install -r "${dir}/requirements.txt" + +export GNUPGHOME="$(mktemp -d)" bucket="${1}" ; shift name="${1}" ; shift @@ -33,7 +35,7 @@ tmpgpg() { "${@}" } -tmpgpg --import ./pubkey.asc +tmpgpg --import "${dir}/pubkey.asc" tar \ --create \ --verbose \