Ensure backup's TRASH folder gets created and used properly.

files/scripts/backup_system.sh

@@ -22,15 +22,16 @@ BACKUP="$BACKUP_DIR/$BASENAME.$DATE.$HOSTNAME.$TAG.zip"
 
 echo "*** Creating Backup Directory ***"
 sudo mkdir -pv "$BACKUP_DIR"
-sudo chmod -Rv 755 "$BACKUP_DIR"
+sudo mkdir -pv "$BACKUP_DIR/TRASH"
+sudo chmod -Rv 775 "$BACKUP_DIR"
 sudo chown -Rv root:root "$BACKUP_DIR"
-cd "$BACKUP_DIR"
 
 ## Cleanup ##
 
 echo "*** Removing Old Backups ***"
-mv -v "$BASENAME"*"$TAG"* ~/TRASH/
-rm -v ~/TRASH/"${BASENAME}*${TAG}*.zip"
+cd "$BACKUP_DIR"
+sudo mv -v "$BASENAME"*"$TAG"* TRASH/
+sudo rm -v TRASH/*
 
 ## Main
 

tasks/general/acct_mgmt/users.yml

@@ -415,6 +415,7 @@
       function clean() {
         clean-trash
         clean-code
+        clean-backups
       }
     function_flatpak_usage: |
       function flatpak-usage() {
@@ -787,6 +788,11 @@
       }
       alias backup-system="backup"
       alias system-backup="backup"
+      alias check-backups="ll /srv/backup"
+      function clean-backup {
+        sh -c "rm -rfv /srv/backup/*.zip /srv/backup/TRASH"
+      }
+      alias clean-backups="clean-backup"
     function_log: |
       function log {
         echo -e "$1"
@@ -872,6 +878,9 @@
       }
       alias ebooks="ebook-convert"
       alias convert="ebook-convert"
+    alias_sudo: |
+      # Allows for alias expansions when using sudo, such as doing "sudo ll".
+      alias sudo="sudo "
 
 - name: General | Account Management | Users | Files | Common Variable
   set_fact:
@@ -946,6 +955,7 @@
       {{ function_log }}
       {{ function_debian_upgrade }}
       {{ function_ebook_convert }}
+      {{ alias_sudo }}
 
 - name: General | Account Management | Users | Files | .bashrc
   blockinfile: