From 43f6f5e80e64a893c56af840add922ba9584117e Mon Sep 17 00:00:00 2001 From: "flyingscorpio@pinebookpro" Date: Sat, 31 Oct 2020 09:47:39 +0100 Subject: [PATCH] Source secrets in hook, not in script. Makes the script usable in other contexts --- borg_backup.sh | 3 --- pacman_hooks/borg_backup.hook | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/borg_backup.sh b/borg_backup.sh index e4635d8..68e9b30 100755 --- a/borg_backup.sh +++ b/borg_backup.sh @@ -39,9 +39,6 @@ fi [ "$1" = '-f' ] || stat_cache_file -# shellcheck source=./secrets -source /home/*/SetupCockpit/secrets - touch "$cache_file" # Setting this so the repo does not need to be given on the command line: BORG_REPO=ssh://"$SSH_REPO":22/~/"$(hostname)".borg diff --git a/pacman_hooks/borg_backup.hook b/pacman_hooks/borg_backup.hook index 4ab75eb..fcf0b74 100644 --- a/pacman_hooks/borg_backup.hook +++ b/pacman_hooks/borg_backup.hook @@ -8,5 +8,5 @@ Target = * [Action] Description = Borg backup When = PreTransaction -Exec = /bin/bash -c "/home/*/SetupCockpit/borg_backup.sh" +Exec = /bin/bash -c "source /home/*/SetupCockpit/secrets && /home/*/SetupCockpit/borg_backup.sh" Depends = borg