Fixes and enhancements for system backups.

files/scripts/backup_system.sh

@@ -1,24 +1,36 @@
-#/usr/bin/env bash
+#!/usr/bin/env bash
 
 ## Variables ##
 
+if [[ -z "$HOSTNAME" ]]; then
+	echo "*** Pulling Hostname From Command ***"
+	export HOSTNAME="`hostname`"
+fi
+if [[ -z "$HOSTNAME" ]]; then
+	echo "*** Pulling Hostname From /etc/ File ***"
+	export HOSTNAME="`cat /etc/hostname`"
+fi
+
 EXTRA="$1"
 TAG="System"
+DATE="`date "+%Y%m%d-%H%M%S"`"
 BACKUP_DIR="/srv/backup"
 BASENAME="$BACKUP_DIR/Backup"
-BACKUP="$BASENAME.`now`.$HOSTNAME.$TAG.zip"
+BACKUP="$BASENAME.$DATE.$HOSTNAME.$TAG.zip"
 
 ## Initialization ##
 
 echo "*** Creating Backup Directory ***"
-mkdir -pv $BACKUP_DIR
-chmod -Rv 755 $BACKUP_DIR
-chown -Rv root:root $BACKUP_DIR
+sudo mkdir -pv "$BACKUP_DIR"
+sudo chmod -Rv 755 "$BACKUP_DIR"
+sudo chown -Rv root:root "$BACKUP_DIR"
+cd "$BACKUP_DIR"
 
 ## Cleanup ##
 
 echo "*** Removing Old Backups ***"
-sh -c 'rm -fv "$BASENAME"*"$TAG"*'
+mv -v "$BASENAME"*"$TAG"* ~/TRASH/
+rm -v ~/TRASH/"${BASENAME}*${TAG}*.zip"
 
 ## Main