From c87df1d263aae6e8c487b328e5e1cc2af82b61fb Mon Sep 17 00:00:00 2001 From: Derek Crudgington Date: Wed, 19 Feb 2025 17:01:55 +0000 Subject: [PATCH] Changed to hostname -f in backuptool --- bin/backuptool | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/backuptool b/bin/backuptool index a32adba..5a4fce7 100755 --- a/bin/backuptool +++ b/bin/backuptool @@ -53,6 +53,7 @@ listbackup_system() { listbackup_allservices() { echo "* Listing backup files for all services.." for i in "${SERVICES[@]}"; do + [ ! -d "/federated/apps/$i" ] && echo "$i not installed, skipping." && continue echo "* Listing backup files for /federated/apps/$i.." PASSPHRASE=$GPG_PASSPHRASE duplicity list-current-files b2://$B2_APPLICATION_KEY_ID:$B2_APPLICATION_KEY@fed-customers/$UUID/federated/apps/$i/ [ $? -ne 0 ] && failcheck "* Couldn't list backup files" @@ -391,7 +392,7 @@ if [ -f "/etc/federated" ]; then [ -z "$B2_APPLICATION_KEY_ID" ] && failcheck "/etc/federated doesn't include B2_APPLICATION_KEY_ID for backups" [ -z "$B2_APPLICATION_KEY" ] && failcheck "/etc/federated doesn't include B2_APPLICATION_KEY for backups" [ -z "$DOMAIN" ] && failcheck "/etc/federated doesn't include DOMAIN for backups" - [[ ! "$BACKUPHOST" ]] && UUID=$(hostname) || UUID="$BACKUPHOST" + [[ ! "$BACKUPHOST" ]] && UUID=$(hostname -f) || UUID="$BACKUPHOST" else failcheck "Could not find an /etc/federated file." fi