Change final backup check to use du again, not ls -l.

tasks/general/acct_mgmt/users.yml

@@ -793,16 +793,70 @@
         date "+%Y%m%d"
       }
     function_backup: |
+      export BACKUP_DIR="/srv/backup"
       function backup {
         /usr/local/bin/backup_system.sh
       }
       alias backup-system="backup"
       alias system-backup="backup"
-      alias check-backups="ll /srv/backup"
+      alias check-backups="ll $BACKUP_DIR"
       function clean-backup {
-        sh -c "rm -rfv /srv/backup/*"
+        sh -c "rm -rfv $BACKUP_DIR/*"
       }
       alias clean-backups="clean-backup"
+    function_pull_prod_backups: |
+      export DOCKER="Docker"
+      export SYSTEM="System"
+      function pull_prod_backup {
+        if [[ -z "$1" || ("$1" != "$DOCKER" && "$1" != "$SYSTEM") ]]; then
+          echo "ERROR: Parameter 1 not correct, expecting '$DOCKER' or '$SYSTEM'."
+          return 1
+        fi
+        backup_type="$1"
+        echo "Looking for '*${backup_type}*.zip'"
+        ls -lh *${backup_type}*.zip 2>/dev/null
+        status="$?"
+        if [[ "$status" == "0" ]]; then
+          echo "File already downloaded, skipping."
+          return 0
+        else
+          echo "File still needed, downloading to local tmp/."
+        fi
+        mkdir -pv tmp
+        scp -P {{ prod_port }} \
+          {{ prod_user }}@{{ prod_host }}:"$BACKUP_DIR/*${backup_type}*.zip" \
+          tmp/
+        if [[ "$?" == "0" ]]; then
+          echo "Succeeded!"
+          mv -v tmp/*.zip ./
+          rmdir -v tmp
+        else
+          echo "Failed!"
+          mv tmp ~/TRASH/"tmp_`now`"
+        fi
+      }
+      function pull_prod_backups {
+        dir="ProductionBackups-Pulled`today`"
+        mkdir -pv "$dir"
+        cd "$dir"
+        pull_prod_backup "$DOCKER"
+        pull_prod_backup "$SYSTEM"
+        du -h *.zip | sort -h
+        status="$?"
+        cd ..
+        if [[ "$status" != 0 ]]; then
+          echo "Failed to find zip files, removing folder."
+          rmdir -v "$dir"
+          return 1
+        fi
+        echo "Done!"
+      }
+      alias pull-prod-backups="pull_prod_backups"
+      alias pull-backups="pull_prod_backups"
+      alias prod-backups="pull_prod_backups"
+      alias prod-backup="pull_prod_backups"
+      alias pull-prod="pull_prod_backups"
+      alias prod-pull="pull_prod_backups"
     function_log: |
       function log {
         echo -e "$1"
@@ -953,6 +1007,12 @@
       alias reset-prod="load-branch prod main"
       alias reset-stage="load-branch stage main"
       alias reset-dev="load-branch dev main"
+    alias_reload_bash: |
+      alias reload-bash="source ~/.bashrc"
+      alias bash-reload="reload-bash"
+      alias shell-reload="reload-bash"
+      alias reload-shell="reload-bash"
+      alias reload="reload-bash"
 
 - name: General | Account Management | Users | Files | Common Variable
   set_fact:
@@ -1024,11 +1084,13 @@
       {{ alias_ansible_facts }}
       {{ function_now }}
       {{ function_backup }}
+      {{ function_pull_prod_backups }}
       {{ function_log }}
       {{ function_debian_upgrade }}
       {{ function_ebook_convert }}
       {{ alias_sudo }}
       {{ function_load_branch }}
+      {{ alias_reload_bash }}
 
 - name: General | Account Management | Users | Files | .bashrc
   blockinfile: