fixed typo, updated variable fancyfy

removes comments from file and prints the rest

bashrc_overrides/_all

@@ -7,6 +7,6 @@ for source in colored_commands \
               ls_aliases \
               safety_aliases \
               terminal_colors \
-              terminal_fancyfying; do
+              terminal_fancyfying_${TERMINAL_FANCYFY}; do
   . "$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/$source"
 done

bashrc_overrides/convenience_aliases

@@ -1,9 +1,11 @@
-alias pubkey='cat ~/.ssh/id_*.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)'
 

bashrc_overrides/docker_aliases

@@ -1,6 +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 --tail=10'
+alias dockerlogs='docker compose logs'
-alias dockerlogsf='docker compose logs --tail=10 --follow'
+alias dockerlogsf='docker compose logs --follow'
+alias dockerlogst='docker compose logs --tail=10'
+alias dockerlogstf='docker compose logs --tail=10 --follow'

deploy.sh

@@ -43,6 +43,7 @@ _delete() {
 
 _bashrc_ref() {
   echo "#REF:bashrc_overrides:REF" >> ~/.bashrc
+  echo "export TERMINAL_FANCYFY=client" >> ~/.bashrc
   echo ". ${THIS}/bashrc_overrides/_all" >> ~/.bashrc
 }