From 014104df3521537e936e8629c6bdee51dcbd6b99 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 30 Aug 2025 18:33:10 +1200 Subject: [PATCH] Update 16 files --- caddy/backup.sh | 4 +++- caddy/destroy.sh | 4 +++- caddy/install.sh | 3 ++- caddy/restore.sh | 4 +++- simple-object-server/backup.sh | 3 ++- simple-object-server/destroy.sh | 3 ++- simple-object-server/install.sh | 3 ++- simple-object-server/restore.sh | 3 ++- squashkiwi/backup.sh | 3 ++- squashkiwi/destroy.sh | 3 ++- squashkiwi/install.sh | 3 ++- squashkiwi/restore.sh | 3 ++- static-website/backup.sh | 3 ++- static-website/destroy.sh | 3 ++- static-website/install.sh | 3 ++- static-website/restore.sh | 3 ++- 16 files changed, 35 insertions(+), 16 deletions(-) diff --git a/caddy/backup.sh b/caddy/backup.sh index 9a00b96..7d6d530 100755 --- a/caddy/backup.sh +++ b/caddy/backup.sh @@ -1,6 +1,8 @@ #!/bin/bash +# shellcheck disable=SC1091 source "${AGENT_PATH}/common.sh" -source "$(dirname "$0")/_volumes.sh" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${SCRIPT_DIR}/_volumes.sh" _check_required_env_vars _stop_container "$CONTAINER_NAME" diff --git a/caddy/destroy.sh b/caddy/destroy.sh index 9754067..14624ca 100755 --- a/caddy/destroy.sh +++ b/caddy/destroy.sh @@ -1,6 +1,8 @@ #!/bin/bash +# shellcheck disable=SC1091 source "${AGENT_PATH}/common.sh" -source "$(dirname "$0")/_volumes.sh" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${SCRIPT_DIR}/_volumes.sh" _check_required_env_vars ./uninstall.sh diff --git a/caddy/install.sh b/caddy/install.sh index 2f13796..55cd8a1 100755 --- a/caddy/install.sh +++ b/caddy/install.sh @@ -1,7 +1,8 @@ #!/bin/bash # shellcheck disable=SC1091 source "${AGENT_PATH}/common.sh" -source "$(dirname "$0")/_volumes.sh" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${SCRIPT_DIR}/_volumes.sh" _check_required_env_vars "CONTAINER_NAME" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG" "DATA_VOLUME" "CONFIG_VOLUME" "CONFIG_PATH" # shellcheck disable=SC2046 diff --git a/caddy/restore.sh b/caddy/restore.sh index f4ad9fa..2190a3f 100755 --- a/caddy/restore.sh +++ b/caddy/restore.sh @@ -1,6 +1,8 @@ #!/bin/bash +# shellcheck disable=SC1091 source "${AGENT_PATH}/common.sh" -source "$(dirname "$0")/_volumes.sh" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${SCRIPT_DIR}/_volumes.sh" _check_required_env_vars # RESTORE SCRIPT diff --git a/simple-object-server/backup.sh b/simple-object-server/backup.sh index fd29c23..5e9f934 100755 --- a/simple-object-server/backup.sh +++ b/simple-object-server/backup.sh @@ -1,7 +1,8 @@ #!/bin/bash # shellcheck disable=SC1091 source "${AGENT_PATH}/common.sh" -source "$(dirname "$0")/_volumes.sh" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${SCRIPT_DIR}/_volumes.sh" _check_required_env_vars "VOLUME_NAME" "BACKUP_FILE" "TEMP_DIR" # Simple Object Storage Backup Script diff --git a/simple-object-server/destroy.sh b/simple-object-server/destroy.sh index 1243c99..40f8bc8 100755 --- a/simple-object-server/destroy.sh +++ b/simple-object-server/destroy.sh @@ -1,7 +1,8 @@ #!/bin/bash # shellcheck disable=SC1091 source "${AGENT_PATH}/common.sh" -source "$(dirname "$0")/_volumes.sh" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${SCRIPT_DIR}/_volumes.sh" _check_required_env_vars # Simple Object Storage Destroy Script diff --git a/simple-object-server/install.sh b/simple-object-server/install.sh index 982b78a..7759486 100755 --- a/simple-object-server/install.sh +++ b/simple-object-server/install.sh @@ -1,7 +1,8 @@ #!/bin/bash # shellcheck disable=SC1091 source "${AGENT_PATH}/common.sh" -source "$(dirname "$0")/_volumes.sh" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${SCRIPT_DIR}/_volumes.sh" _check_required_env_vars # Simple Object Storage Install Script diff --git a/simple-object-server/restore.sh b/simple-object-server/restore.sh index bffd647..dc63913 100755 --- a/simple-object-server/restore.sh +++ b/simple-object-server/restore.sh @@ -1,7 +1,8 @@ #!/bin/bash # shellcheck disable=SC1091 source "${AGENT_PATH}/common.sh" || _die "Failed to source common.sh" -source "$(dirname "$0")/_volumes.sh" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${SCRIPT_DIR}/_volumes.sh" _check_required_env_vars "BACKUP_FILE" "TEMP_DIR" "VOLUME_NAME" "CONTAINER_NAME" # Simple Object Storage Restore Script diff --git a/squashkiwi/backup.sh b/squashkiwi/backup.sh index 5dc1e48..bcdfd52 100755 --- a/squashkiwi/backup.sh +++ b/squashkiwi/backup.sh @@ -1,7 +1,8 @@ #!/bin/bash # shellcheck disable=SC1091 source "${AGENT_PATH}/common.sh" -source "$(dirname "$0")/_paths.sh" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${SCRIPT_DIR}/_paths.sh" _check_required_env_vars "CONTAINER_NAME" "LOCAL_DATA_FOLDER" "BACKUP_FILE" "TEMP_DIR" # Stop container before backup diff --git a/squashkiwi/destroy.sh b/squashkiwi/destroy.sh index 90c87bf..b7658d1 100755 --- a/squashkiwi/destroy.sh +++ b/squashkiwi/destroy.sh @@ -1,7 +1,8 @@ #!/bin/bash # shellcheck disable=SC1091 source "${AGENT_PATH}/common.sh" -source "$(dirname "$0")/_paths.sh" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${SCRIPT_DIR}/_paths.sh" _check_required_env_vars "LOCAL_DATA_FOLDER" ./uninstall.sh diff --git a/squashkiwi/install.sh b/squashkiwi/install.sh index 3cb8a1c..0b32050 100755 --- a/squashkiwi/install.sh +++ b/squashkiwi/install.sh @@ -1,7 +1,8 @@ #!/bin/bash # shellcheck disable=SC1091 source "${AGENT_PATH}/common.sh" -source "$(dirname "$0")/_paths.sh" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${SCRIPT_DIR}/_paths.sh" _check_required_env_vars "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG" "CONTAINER_NAME" "LOCAL_DATA_FOLDER" # shellcheck disable=SC2046 diff --git a/squashkiwi/restore.sh b/squashkiwi/restore.sh index e3932d4..e0d5d34 100755 --- a/squashkiwi/restore.sh +++ b/squashkiwi/restore.sh @@ -1,7 +1,8 @@ #!/bin/bash # shellcheck disable=SC1091 source "${AGENT_PATH}/common.sh" -source "$(dirname "$0")/_paths.sh" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${SCRIPT_DIR}/_paths.sh" _check_required_env_vars "CONTAINER_NAME" "LOCAL_DATA_FOLDER" "BACKUP_FILE" "TEMP_DIR" # RESTORE SCRIPT diff --git a/static-website/backup.sh b/static-website/backup.sh index 4506fb6..f1749b1 100755 --- a/static-website/backup.sh +++ b/static-website/backup.sh @@ -1,7 +1,8 @@ #!/bin/bash # shellcheck disable=SC1091 source "${AGENT_PATH}/common.sh" -source "$(dirname "$0")/_paths.sh" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${SCRIPT_DIR}/_paths.sh" _check_required_env_vars "LOCAL_DATA_FOLDER" "BACKUP_FILE" "TEMP_DIR" "CONTAINER_NAME" # Nginx Example Backup Script diff --git a/static-website/destroy.sh b/static-website/destroy.sh index cfcd819..1c6a0d9 100755 --- a/static-website/destroy.sh +++ b/static-website/destroy.sh @@ -1,7 +1,8 @@ #!/bin/bash # shellcheck disable=SC1091 source "${AGENT_PATH}/common.sh" -source "$(dirname "$0")/_paths.sh" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${SCRIPT_DIR}/_paths.sh" _check_required_env_vars "LOCAL_DATA_FOLDER" "CONTAINER_NAME" # Removes container and local data folder. diff --git a/static-website/install.sh b/static-website/install.sh index 5efb18c..ee7684b 100755 --- a/static-website/install.sh +++ b/static-website/install.sh @@ -1,7 +1,8 @@ #!/bin/bash # shellcheck disable=SC1091 source "${AGENT_PATH}/common.sh" -source "$(dirname "$0")/_paths.sh" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${SCRIPT_DIR}/_paths.sh" _check_required_env_vars "LOCAL_DATA_FOLDER" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG" "CONTAINER_NAME" # Nginx Example Install Script diff --git a/static-website/restore.sh b/static-website/restore.sh index 0f0ab9f..4acc6db 100755 --- a/static-website/restore.sh +++ b/static-website/restore.sh @@ -1,7 +1,8 @@ #!/bin/bash # shellcheck disable=SC1091 source "${AGENT_PATH}/common.sh" -source "$(dirname "$0")/_paths.sh" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "${SCRIPT_DIR}/_paths.sh" _check_required_env_vars "LOCAL_DATA_FOLDER" "BACKUP_FILE" "TEMP_DIR" "CONTAINER_NAME" # Nginx Example Restore Script