added dockerpull alias

removes comments from file and prints the rest

bashrc_overrides/_all

@@ -1,13 +1,12 @@
 for source in colored_commands \
               convenience_aliases \
+              docker_aliases \
               git_functions \
               histcontrol \
               home_bin_folder \
               ls_aliases \
               safety_aliases \
               terminal_colors \
-              terminal_fancyfying; do
+              ${TERMINAL_FANCIFY}; do
-  if [ -f ~/.bashrc_overrides/$source ]; then
+  . "$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/$source"
-    . ~/.bashrc_overrides/$source
-  fi
 done

bashrc_overrides/convenience_aliases

@@ -1,8 +1,15 @@
-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 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 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

@@ -13,4 +13,4 @@ if [ $GIT_FUNCTIONS ]; then
 fi
 
 #PS1="$PS1${RED}#${FORMAT_RESET}"
-PS1="$PS1${RED}${FORMAT_BLINK}\$${FORMAT_RESET}"
+PS1="$PS1${RED}\$${FORMAT_RESET}"

deploy.sh

@@ -43,6 +43,7 @@ _delete() {
 
 _bashrc_ref() {
   echo "#REF:bashrc_overrides:REF" >> ~/.bashrc
+  echo "export TERMINAL_FANCIFY=terminal_fancyfying" >> ~/.bashrc
   echo ". ${THIS}/bashrc_overrides/_all" >> ~/.bashrc
 }
 
@@ -69,7 +70,9 @@ _main() {
   fi
 
   if [ "${SERVER}" = true ]; then
-    sed -i 's/terminal_fancyfying/terminal_fancyfying_server/' ~/.bashrc_overrides/_all
+    sed -i 's/terminal_fancyfying/terminal_fancyfying_server/' ${THIS}/bashrc_overrides/_all
+  else
+    sed -i 's/terminal_fancyfying_server/terminal_fancyfying/' ${THIS}/bashrc_overrides/_all
   fi
 }