Merge pull request 'BASHrc Upgrades, Backup Script, DWM Enhancements, Hugo Helpers, Branch Controls' (#7) from dev into main

Reviewed-on: #7

files/scripts/backup_system.sh

@@ -39,7 +39,7 @@ echo "*** Creating backup at '$BACKUP' ***"
 sudo zip -rv "$BACKUP" \
 	/etc /var/{log,mail,spool} /srv /boot \
 	/usr/local/etc $EXTRA \
-	-x "/srv/backup/*"
+	-x "/srv/backup/*" -x "/srv/sftp/*"
 status="$?"
 
 if [[ "$status" != 0 ]]; then

files/scripts/compress_image.sh

@@ -28,7 +28,7 @@ function usage() {
 	# Parameters:
 	#   1) The exit status to use.
 	status=$1
-	echo "Usage: $PROG [-s SIZE] [-l LOCATION] [-A | [-r] [-f] [-d] [-c]] [-h] [-x]" >&2
+	echo "Usage: $PROG [-s SIZE] [-l LOCATION] [-A | [-r] [-f] [-d] [-c]] [-h] [-x] [-t]" >&2
 	cat <<- EOF
 		  Compress JPG or PNG image(s). Can handle folders and work recursively.
 
@@ -45,13 +45,14 @@ function usage() {
 		  -A : Resursively Force, Delete, and Clean.
 		  -h : Display this usage text.
 		  -x : Enable BASH debugging.
+		  -t : Format timestamp.
 	EOF
 	exit $status
 }
 
 ## Parameters ##
 
-while getopts ":s:l:rfFdcAhx" opt; do
+while getopts ":s:l:rfFdcAhxt" opt; do
 	case $opt in
 		s) in_size="$OPTARG" && size="$in_size" ;;
 		l) location="$OPTARG" ;;
@@ -64,6 +65,7 @@ while getopts ":s:l:rfFdcAhx" opt; do
 		A) recurse="Y" && search="find" && force="Y" && delete="Y" && expand="Y" ;;
 		h) usage 0 ;;
 		x) set -x ;;
+		t) format_time="Y" ;;
 		*) echo "ERROR: Option $OPTARG not recognized." >&2 && usage 1 ;;
 	esac
 done
@@ -130,7 +132,9 @@ $search "$location" | sort | while read image; do
 	# Date Data
 	new_image_exp="${TEMP:0:4}-${TEMP:4:2}-${TEMP:6:2}"
 	# Time Data
-	new_image_exp="${new_image_exp}_${TEMP:8:2}-${TEMP:10:2}-${TEMP:12:2}"
+	if [[ "$format_time" == "Y" ]]; then
+		new_image_exp="${new_image_exp}_${TEMP:8:2}-${TEMP:10:2}-${TEMP:12:2}"
+	fi
 	# Remainder Data
 	if [[ "${TEMP:14:1}" == "." ]]; then
 		SEP=""

tasks/general/acct_mgmt/users.yml

@@ -957,7 +957,7 @@
 
         if [[ "$rcvr" == "main" ]]; then
           echo "*** ERROR: Are you nuts, fool!? Not main! Do it manually! ***"
-          exit 1
+          return 1
         fi
 
         if [[ -z "$base" ]]; then
@@ -967,7 +967,7 @@
             base="dev"
           else
             echo "* Unsure which branch to use for '$rcvr'. Please specify."
-            exit 1
+            return 1
           fi
           echo "* Base was not specified, using '$base' for '$rcvr'."
         else
@@ -1011,6 +1011,18 @@
       alias reset-prod="load-branch prod main"
       alias reset-stage="load-branch stage main"
       alias reset-dev="load-branch dev main"
+      function check-code-branches {
+        for dir in ~/Code/*/; do
+          cd $dir
+          pwd
+          git ls-remote --heads
+          echo " "
+          cd ..
+        done
+      }
+      alias check-branches="check-code-branches"
+      alias check-branch="git ls-remote --heads"
+      alias branch-check="check-branch"
     alias_reload_bash: |
       alias reload-bash="source ~/.bashrc"
       alias bash-reload="reload-bash"
@@ -1031,8 +1043,6 @@
     alias_flatpak_clean: |
       alias flatpak-clean="flatpak uninstall --unused"
     alias_commit: |
-      # TBD function to git add, git commit, and git push in a single go.
-      # Already exists on Termux env. Needs tested.
       function commit_usage {
         echo 'Usage: commit "This is a commit message"'
       }
@@ -1135,6 +1145,7 @@
       {{ global_functions }}
       {{ alias_docker_other }}
       {{ alias_flatpak_clean }}
+      {{ alias_commit }}
 
 - name: General | Account Management | Users | Files | .bashrc
   blockinfile: