Tidy

templates/simple-object-storage/backup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 source "${AGENT_PATH}/_common.sh"
-_check_required_env_vars
+_check_required_env_vars "VOLUME_NAME"
 
 # Simple Object Storage Backup Script
 # Creates a backup tarball of the volume contents.
@@ -8,6 +8,6 @@ _check_required_env_vars
 
 
 # HOT backup is fine for simple-object-storage
-autobackup "volume=${VOLUME_NAME}" $1 $2 || _die "Failed to create backup"
+autobackup "$1" "$2" "volume=${VOLUME_NAME}" || _die "Failed to create backup"
 
 echo "Backup complete: ${BACKUP_FILE}"

templates/simple-object-storage/install.sh

@@ -5,8 +5,6 @@ _check_required_env_vars
 # Simple Object Storage Install Script
 # Pulls image, creates volume/config, starts container.
 
-
-
 autocreate "volume=${VOLUME_NAME}"
 
 # check can pull image on remote host and exit if fails

templates/simple-object-storage/nuke.sh

@@ -6,4 +6,6 @@ _check_required_env_vars
 # Removes container AND volume.
 
 
-autonuke "volume=${VOLUME_NAME}"
+autonuke "volume=${VOLUME_NAME}" || _die "Failed to nuke volume ${VOLUME_NAME}"
+
+echo "Nuke complete for service ${CONTAINER_NAME}." 

templates/simple-object-storage/restore.sh

@@ -12,9 +12,7 @@ bash ./uninstall.sh || _die "Failed to uninstall service before restore"
 
 echo "Restoring data for ${CONTAINER_NAME} from ${BACKUP_FILE}..."
 
-if ! autorestore "volume=${VOLUME_NAME}" "$1" "$2"; then
-    _die "Failed to restore data from backup file"
-fi
+autorestore "$1" "$2" "volume=${VOLUME_NAME}" || _die "Failed to restore data from backup file"
 
 echo "Restore complete. Reinstalling service..."