From ea0e2d0e955a933db6dd4e794a6046345304974f Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 1 Sep 2025 20:06:48 +1200 Subject: [PATCH] Update 5 files --- squashkiwi-streaming/backup.sh | 2 +- squashkiwi-streaming/config/.template_info.env | 4 +++- squashkiwi-streaming/destroy.sh | 4 ++-- squashkiwi-streaming/install.sh | 2 +- squashkiwi-streaming/restore.sh | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/squashkiwi-streaming/backup.sh b/squashkiwi-streaming/backup.sh index 72e92a8..c37a3ee 100755 --- a/squashkiwi-streaming/backup.sh +++ b/squashkiwi-streaming/backup.sh @@ -3,7 +3,7 @@ source "${AGENT_PATH}/common.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" +_check_required_env_vars "PROJECT_NAME" "LOCAL_DATA_FOLDER" "BACKUP_FILE" "TEMP_DIR" # shellcheck disable=SC2046 backup_items $(get_squashkiwi_streaming_paths) || _die "Failed to create backup" diff --git a/squashkiwi-streaming/config/.template_info.env b/squashkiwi-streaming/config/.template_info.env index b5f58a4..704005e 100644 --- a/squashkiwi-streaming/config/.template_info.env +++ b/squashkiwi-streaming/config/.template_info.env @@ -4,6 +4,7 @@ # Template to use - always required! TEMPLATE=squashkiwi-streaming +TEMPLATE_HASH=0 REQUIRES_HOST_ROOT=false REQUIRES_DOCKER=true REQUIRES_DOCKER_ROOT=false @@ -15,4 +16,5 @@ WEBRTC_PORT=8889 WEB_PORT=80 # Deployment settings -PROJECT_NAME="squashkiwi-streaming" \ No newline at end of file +PROJECT_NAME="squashkiwi-streaming" +CONTAINER_NAME="squashkiwi-streaming" \ No newline at end of file diff --git a/squashkiwi-streaming/destroy.sh b/squashkiwi-streaming/destroy.sh index e745f3d..1e11d4f 100755 --- a/squashkiwi-streaming/destroy.sh +++ b/squashkiwi-streaming/destroy.sh @@ -3,7 +3,7 @@ source "${AGENT_PATH}/common.sh" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "${SCRIPT_DIR}/_paths.sh" -_check_required_env_vars "LOCAL_DATA_FOLDER" +_check_required_env_vars "LOCAL_DATA_FOLDER" "PROJECT_NAME" "RECORDINGS_FOLDER" "${SCRIPT_DIR}/uninstall.sh" @@ -11,5 +11,5 @@ _check_required_env_vars "LOCAL_DATA_FOLDER" destroy_items $(get_squashkiwi_streaming_paths) || _die "Failed to destroy ${LOCAL_DATA_FOLDER}" rm -rf "${RECORDINGS_FOLDER}" -echo "Destroyed ${CONTAINER_NAME}" +echo "Destroyed ${PROJECT_NAME}" diff --git a/squashkiwi-streaming/install.sh b/squashkiwi-streaming/install.sh index 85f7c28..d666d69 100755 --- a/squashkiwi-streaming/install.sh +++ b/squashkiwi-streaming/install.sh @@ -3,7 +3,7 @@ source "${AGENT_PATH}/common.sh" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "${SCRIPT_DIR}/_paths.sh" -_check_required_env_vars "PROJECT_NAME" "LOCAL_DATA_FOLDER" "CAMERA_IP" "COURT_ID" +_check_required_env_vars "PROJECT_NAME" "LOCAL_DATA_FOLDER" "CAMERA_IP" "COURT_ID" "RECORDINGS_FOLDER" # Create directories # shellcheck disable=SC2046 diff --git a/squashkiwi-streaming/restore.sh b/squashkiwi-streaming/restore.sh index e01382b..e705ab3 100755 --- a/squashkiwi-streaming/restore.sh +++ b/squashkiwi-streaming/restore.sh @@ -3,7 +3,7 @@ source "${AGENT_PATH}/common.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" +_check_required_env_vars "PROJECT_NAME" "LOCAL_DATA_FOLDER" "BACKUP_FILE" "TEMP_DIR" # RESTORE SCRIPT # The restore script is OPTIONAL.