Tidy

templates/caddy/backup.sh

@@ -4,9 +4,7 @@ _check_required_env_vars
 
 _stop_container "$CONTAINER_NAME"
 
-if ! autobackup volume=$DATA_VOLUME volume=$CONFIG_VOLUME $1 $2; then
-    _die "Failed to create backup"
-fi
+autobackup "$1" "$2" "volume=$DATA_VOLUME" "volume=$CONFIG_VOLUME" || _die "Failed to create backup"
 
 _start_container "$CONTAINER_NAME"
 

templates/caddy/install.sh

@@ -2,9 +2,7 @@
 source "${AGENT_PATH}/_common.sh"
 _check_required_env_vars "CONTAINER_NAME" "IMAGE_REGISTRY" "IMAGE_REPO" "IMAGE_TAG" "DATA_VOLUME" "CONFIG_VOLUME" "CONFIG_PATH"
 
-if ! autocreate volume=$DATA_VOLUME volume=$CONFIG_VOLUME; then
-    _die "Failed to autocreate volumes and paths"
-fi
+autocreate "volume=$DATA_VOLUME" "volume=$CONFIG_VOLUME" || _die "Failed to autocreate volumes $DATA_VOLUME and $CONFIG_VOLUME"
 
 _check_docker_installed || _die "Docker test failed, aborting installation..."
 

templates/caddy/nuke.sh

@@ -8,8 +8,6 @@ _check_required_env_vars
 # any docker volumes and any custom local data folders.
 
 
-if ! autonuke volume=$DATA_VOLUME volume=$CONFIG_VOLUME; then
-    _die "Failed to nuke"
-fi
+autonuke "volume=$DATA_VOLUME" "volume=$CONFIG_VOLUME" || _die "Failed to nuke"
 
 echo "Nuking of ${CONTAINER_NAME} complete."

templates/caddy/restore.sh

@@ -9,9 +9,7 @@ _check_required_env_vars
 bash ./uninstall.sh || _die "Failed to uninstall service before restore"
 
 # restore data from backup file
-if ! autorestore volume=$DATA_VOLUME volume=$CONFIG_VOLUME "$1" "$2"; then
-    _die "Failed to restore data from backup file"
-fi
+autorestore "$1" "$2" "volume=$DATA_VOLUME" "volume=$CONFIG_VOLUME" || _die "Failed to restore data from backup file"
 
 # reinstall service
 bash ./install.sh || _die "Failed to reinstall service after restore"