removed network host from sambaserver, fixed samba options

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

bashrc_overrides/_all

@@ -1,3 +1,4 @@
-for source in $(find "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)" -type f | grep -v "_all"); do
+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

@@ -8,8 +8,9 @@ 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'

deploy.sh

@@ -1,14 +1,29 @@
 #!/usr/bin/env bash
 
 THIS="$(dirname "$(readlink -fm "$0")")"
-SERVER=false
+FANCYFY="client"
+CURRENT_FANCYFY=""
 DELETE=false
 MOVE=false
+PRESENT=false
+BASHRC="~/.bashrc"
+
+_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 +44,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,18 +53,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 "#REF:bashrc_overrides:REF" >> "${BASHRC}"
-  echo "export TERMINAL_FANCYFY=client" >> ~/.bashrc
+  echo "export TERMINAL_FANCYFY=${1}" >> "${BASHRC}"
-  echo ". ${THIS}/bashrc_overrides/_all" >> ~/.bashrc
+  echo ". ${THIS}/bashrc_overrides/_all" >> "${BASHRC}"
 }
 
 _move() {
   _delete
-  _bashrc_ref
+  _bashrc_ref "${FANCYFY}"
 }
 
 _main() {
@@ -57,23 +72,34 @@ _main() {
 
   if [ "${DELETE}" = true ]; then
     _delete
+    echo "removed custom configs"
   elif [ "${MOVE}" = true ]; then
+    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
-  elif [ ! -z "$(grep "#REF:bashrc_overrides:REF" ~/.bashrc)" ]; then
+      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/' ${THIS}/bashrc_overrides/_all
-  else
-    sed -i 's/terminal_fancyfying_server/terminal_fancyfying/' ${THIS}/bashrc_overrides/_all
-  fi
 }
 
 _main "$@"