added check for git command presence to enable git functions in terminal fancyfying

excluded fancyfy from source in for loop
added sourcing only the correct file

bashrc_overrides/_all

@@ -1,13 +1,4 @@
-for source in colored_commands \
-              convenience_aliases \
-              git_functions \
-              histcontrol \
-              home_bin_folder \
-              ls_aliases \
-              safety_aliases \
-              terminal_colors \
-              terminal_fancyfying; do
-  if [ -f ~/.bashrc_overrides/$source ]; then
-    . ~/.bashrc_overrides/$source
-  fi
+for source in $(find "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)" -type f | grep -Ev "_all|terminal_fancyfying"); do
+  . "${source}"
 done
+. "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)/terminal_fancyfying_${TERMINAL_FANCYFY}"

bashrc_overrides/convenience_aliases

@@ -1,8 +1,16 @@
-alias pubkey='cat ~/.ssh/id_rsa.pub'
+alias pubkey='for PUBKEY_FILE in $(ls ~/.ssh/id_*.pub); do echo "${PUBKEY_FILE} :" | sed -e "s/.*id_//;s/\.pub//"; cat "${PUBKEY_FILE}"; echo; done'
 alias hosts='sudo nano /etc/hosts'
 alias historygrep='history | grep'
 alias sshconfig='nano ~/.ssh/config'
+alias bashrc='. ~/.bashrc'
+alias sshagent='eval `ssh-agent` && ssh-add ~/.ssh/id_!(*.pub)'
+alias sshfingerprint='ssh-keygen -lf'
+alias nocomments='grep -vE "^$|^#|^;"'
 alias newrepo='bash <(curl -s https://get.bjphoster.com/new-git-repo.sh)'
+alias newansibleworkspace='bash <(curl -s https://get.bjphoster.com/new-ansible-workspace.sh)'
+alias infinitenothing='while true; do sleep 1; done'
 
-alias sambaserver='docker run -it --rm --network host -p 137:137 -p 138:138 -p 139:139 -p 445:445 -v `pwd`:/share dperson/samba -n -p -s "sambashare;/share;yes;no;no;shareuser" -w "WORKGROUP"'
+alias sambaserver='docker run -it --rm -p 137:137 -p 138:138 -p 139:139 -p 445:445 -v `pwd`:/share dperson/samba -n -p -s "share;/share;yes;no;yes" -w "WORKGROUP"'
+alias acme.sh='docker run -it --rm -v ~/acme.sh:/acme.sh neilpang/acme.sh'
 alias termbin='nc termbin.com 9999'
+alias dnsversion='dig txt chaos version.bind'

bashrc_overrides/docker_aliases

@@ -0,0 +1,9 @@
+alias dockerpull='docker compose pull'
+alias dockerup='docker compose up'
+alias dockerupd='docker compose up -d'
+alias dockerdown='docker compose down'
+alias dockerdownv='docker compose down --volumes'
+alias dockerlogs='docker compose logs'
+alias dockerlogsf='docker compose logs --follow'
+alias dockerlogst='docker compose logs --tail=10'
+alias dockerlogstf='docker compose logs --tail=10 --follow'

bashrc_overrides/terminal_fancyfying_client

@@ -1,4 +1,7 @@
-GIT_FUNCTIONS=true
+command -v git &>/dev/null
+if [ $? -eq 0 ]; then
+  GIT_FUNCTIONS=true
+fi
 
 # Spaced
 #PS1="${LIGHTBLUE}[ ${LIGHTRED}\u ${LIGHTBLUE}@ ${LIGHTBROWN}$(hostname --fqdn) ${LIGHTBLUE}] ${LIGHTPURPLE}( ${GREEN}\w ${LIGHTPURPLE}) "
@@ -7,10 +10,10 @@ GIT_FUNCTIONS=true
 # another version I really like
 PS1="${PURPLE}\# ${LIGHTBLUE}{${LIGHTGREEN}\u${BROWN}@${LIGHTGREEN}\$(hostname --fqdn)${LIGHTBLUE}} ${LIGHTPURPLE}[${CYAN}\w${LIGHTPURPLE}] "
 
-if [ $GIT_FUNCTIONS ]; then
+if [ $GIT_FUNCTIONS = "true" ]; then
   #PS1="$PS1${LIGHTPURPLE}[${LIGHTCYAN}$(__git_prompt)${LIGHTPURPLE}]"
   PS1="$PS1${LIGHTBROWN}(${LIGHTCYAN}\$(__git_prompt)${LIGHTBROWN}) "
 fi
 
 #PS1="$PS1${RED}#${FORMAT_RESET}"
-PS1="$PS1${RED}${FORMAT_BLINK}\$${FORMAT_RESET}"
+PS1="$PS1${RED}\$${FORMAT_RESET}"

bashrc_overrides/terminal_fancyfying_server

@@ -1,11 +1,14 @@
-GIT_FUNCTIONS=true
+command -v git &>/dev/null
+if [ $? -eq 0 ]; then
+  GIT_FUNCTIONS=true
+fi
 
 # Spaced
 #PS1="${LIGHTBLUE}[ ${LIGHTRED}\u ${LIGHTBLUE}@ ${LIGHTBROWN}$(hostname --fqdn) ${LIGHTBLUE}] ${LIGHTPURPLE}( ${GREEN}\w ${LIGHTPURPLE}) "
 # Not spaced
 PS1="${LIGHTBLUE}[${LIGHTRED}\u${LIGHTBLUE}@${LIGHTBROWN}$(hostname --fqdn)${LIGHTBLUE}]${LIGHTPURPLE}(${GREEN}\w${LIGHTPURPLE})"
 
-if [ $GIT_FUNCTIONS ]; then
+if [ $GIT_FUNCTIONS = "true" ]; then
   #PS1="$PS1${LIGHTPURPLE}[${LIGHTCYAN}$(__git_prompt)${LIGHTPURPLE}]"
   PS1="$PS1${LIGHTBROWN}(${LIGHTCYAN}\$(__git_prompt)${LIGHTBROWN}) "
 fi

deploy.sh

@@ -1,14 +1,28 @@
 #!/usr/bin/env bash
 
 THIS="$(dirname "$(readlink -fm "$0")")"
-SERVER=false
+FANCYFY="client"
+CURRENT_FANCYFY=""
 DELETE=false
 MOVE=false
+PRESENT=false
+
+_bashrc_present() {
+  if [ ! -z "$(grep "#REF:bashrc_overrides:REF" ~/.bashrc)" ]; then
+    echo true
+    exit
+  fi
+  echo false
+}
 
 _arguments() {
+  if [ "$(_bashrc_present)" = true ]; then
+    PRESENT=true
+    CURRENT_FANCYFY="$(grep TERMINAL_FANCYFY ~/.bashrc | sed 's/.*=//')"
+  fi
   for PARM in "$@"; do
     if [ "${PARM}" = "--server" ]; then
-      SERVER=true
+      FANCYFY="server"
     elif [ "${PARM}" = "--delete" ]; then
       DELETE=true
     elif [ "${PARM}" = "--move" ]; then
@@ -29,7 +43,7 @@ _help() {
   echo "  --force"
   echo "    Force the reinstallation of the files"
   echo "  --delete"
-  echo "    Delete the reference in ~/.bashrc"
+  echo "    Delete the reference in ${BASHRC}"
   echo "  --move"
   echo "    Create a new reference if the location of this folder has been changed"
   echo "  --server"
@@ -38,17 +52,18 @@ _help() {
 }
 
 _delete() {
-  sed -i '/REF:bashrc_overrides:REF/{N;d}' ~/.bashrc
+  sed -i '/REF:bashrc_overrides:REF/{N;N;d}' ~/.bashrc
 }
 
 _bashrc_ref() {
   echo "#REF:bashrc_overrides:REF" >> ~/.bashrc
+  echo "export TERMINAL_FANCYFY=${1}" >> ~/.bashrc
   echo ". ${THIS}/bashrc_overrides/_all" >> ~/.bashrc
 }
 
 _move() {
   _delete
-  _bashrc_ref
+  _bashrc_ref "${FANCYFY}"
 }
 
 _main() {
@@ -56,23 +71,34 @@ _main() {
 
   if [ "${DELETE}" = true ]; then
     _delete
+    echo "removed custom configs"
   elif [ "${MOVE}" = true ]; then
-    _move
-  elif [ ! -z "$(grep "#REF:bashrc_overrides:REF" ~/.bashrc)" ]; then
-    echo "bash overrides already in place"
-    echo "skipping..."
-    echo
+    if [ "${PRESENT}" = false ]; then
+      _bashrc_ref "${FANCYFY}"
+      echo "unable to move to current directory"
+      echo "bash overrides not previously present"
+      echo "adding bash overrides..."
+      echo
+    else
+      _move
+      echo "moved custom config directory to ${THIS}"
+      echo
+    fi
+  elif [ "${PRESENT}" = true ]; then
+    if [ "${CURRENT_FANCYFY}" != "${FANCYFY}" ]; then
+      sed -i "s/TERMINAL_FANCYFY=${CURRENT_FANCYFY}/TERMINAL_FANCYFY=${FANCYFY}/" ~/.bashrc
+      echo "customized fancyfying"
+      echo
+    else
+      echo "bash overrides already in place"
+      echo "skipping..."
+      echo
+    fi
   else
-    _bashrc_ref
+    _bashrc_ref "${FANCYFY}"
     echo "bash overrides added"
     echo
   fi
-
-  if [ "${SERVER}" = true ]; then
-    sed -i 's/terminal_fancyfying/terminal_fancyfying_server/' ~/.bashrc_overrides/_all
-  else
-    sed -i 's/terminal_fancyfying_server/terminal_fancyfying/' ~/.bashrc_overrides/_all
-  fi
 }
 
 _main "$@"