chore: cleaned up

Author: tobybatch

.idea/.bash.d.iml

@@ -1,8 +1,8 @@
 ESC_SEQ="\x1b["
-COL_RESET=$ESC_SEQ"39;49;00m"
-COL_RED=$ESC_SEQ"31;01m"
-COL_GREEN=$ESC_SEQ"32;01m"
-COL_YELLOW=$ESC_SEQ"33;01m"
-COL_BLUE=$ESC_SEQ"34;01m"
-COL_MAGENTA=$ESC_SEQ"35;01m"
-COL_CYAN=$ESC_SEQ"36;01m"
+export COL_RESET=$ESC_SEQ"39;49;00m"
+export COL_RED=$ESC_SEQ"31;01m"
+export COL_GREEN=$ESC_SEQ"32;01m"
+export COL_YELLOW=$ESC_SEQ"33;01m"
+export COL_BLUE=$ESC_SEQ"34;01m"
+export COL_MAGENTA=$ESC_SEQ"35;01m"
+export COL_CYAN=$ESC_SEQ"36;01m"

.idea/.gitignore

@@ -1 +1,4 @@
-export PATH=$PATH:$HOME/bin:$HOME/.local/bin:$HOME/.screenlayout:$HOME/opt/Postman
+export PATH=$PATH:$HOME/bin
+export PATH=$PATH:$HOME/.local/bin
+export PATH=$PATH:$HOME/.screenlayout
+export PATH=$PATH:$HOME/opt/Postman

.idea/modules.xml

@@ -1,4 +1,4 @@
 # anything in $HOME/.local/bash_completion.d ending .bash get included
-source $HOME/.local/bash_completion.d/*.bash
+source "$HOME/.local/bash_completion.d/*.bash"
 
-# other environment specific scriots should not end .bash, e.g. see 87_django.bash
+# other environment specific scripts should not end .bash, e.g. see 87_django.bash

.idea/vcs.xml

@@ -1,30 +1,89 @@
-export PATH=$HOME/usr/lib/Shell-tools:$PATH
-
 function countdown() {
-    start="$(( $(date '+%s') + $1))"
-    while [ $start -ge $(date +%s) ]; do
-        time="$(( $start - $(date +%s) ))"
-        printf '%s\r' "$(date -u -d "@$time" +%H:%M:%S)"
-        sleep 0.1
-    done
+  start="$(($(date '+%s') + $1))"
+  while [ $start -ge "$(date +%s)" ]; do
+    time="$((start - $(date +%s)))"
+    printf '%s\r' "$(date -u -d "@$time" +%H:%M:%S)"
+    sleep 0.1
+  done
 }
 
 function fixperms {
-    # HTTPDUSER=$(ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\  -f1)
-    HTTPDUSER=www-data
+  while getopts "u:h" options; do
+    case $options in
+    u) NEW_USER="$OPTARG" ;;
+    h)
+      echo "Use setfacl to give a single user +rw/+rwx to a subtree of commands, defaults to current user"
+      echo "$0 [-u <user_id|user_name] dir1 dir2 ..."
+      exit
+      ;;
+    *) echo "unknown option" ;;
+    esac
+  done
+
+  if [ -z "$NEW_USER" ]; then
+    NEW_USER=$USER
+  fi
+
+  if [[ -z $1 ]]; then
+    TARGET=$(pwd)
+  else
+    # TODO Fix the shellcheck SC2124
+    # shellcheck disable=SC2124
+    TARGET=$@
+  fi
+
+  echo -e "${COL_YELLOW}Fix permission on current directory and all sub directories?${COL_RESET}"
+  read -p "Are you sure? " -n 1 -r
+  echo
+  if [[ $REPLY =~ ^[Yy]$ ]]; then
+    sudo setfacl -dR -m u:"$NEW_USER":rwX -m u:"$(whoami)":rwX "$TARGET"
+    sudo setfacl -R -m u:"$NEW_USER":rwX -m u:"$(whoami)":rwX "$TARGET"
+  fi
+}
 
-    if [[ -z $1 ]]; then
-        echo -e "${COL_YELLOW}Fix permission on current directory and all sub directories?${COL_RESET}"
-        read -p "Are you sure? " -n 1 -r
+function randpass {
+  while getopts "hsx" options; do
+    case $options in
+      h)
+        echo   "$(basename "$0") [-s] [-x]"
         echo
-        if [[ $REPLY =~ ^[Yy]$ ]]; then
-            TARGET=$(pwd)
-        else
-            return 0
-        fi
+        echo "Generates a random 24 character password.  The -s flag restricts the password"
+        echo "to alphanumeric characters only.  The -x will use the XKCD random four word"
+        echo "password generation (http://xkcd.com/936/)"
+      ;;
+      x)  xkcd=1;;
+      s)  safe=1;;
+      *)  echo "Unknown option";;
+    esac
+  done
+
+  if [ -z $xkcd ]; then
+    if [ -z $safe ]; then
+      pass=$(</dev/urandom tr -dc 'A-Za-z0-9!@#$%&/()=' | head -c24)
     else
-        TARGET="$@"
+      pass=$(</dev/urandom tr -dc 'A-Za-z0-9' | head -c24)
     fi
-    sudo setfacl -dR -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX $TARGET
-    sudo setfacl -R -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX  $TARGET
+  else
+    pass=$( \
+      grep -v "'" /usr/share/dict/words| \
+      shuf -n4 | \
+      sed 's/.*/\L&/g' | \
+      iconv -f utf8 -t ascii//TRANSLIT \
+      )
+  fi
+
+  colours="$COL_RED $COL_GREEN $COL_YELLOW $COL_BLUE"
+
+  for word in $pass; do
+    colour=$(echo "$colours" | awk '{print $1}')
+    echo -en "$colour""$word"
+    colours=$(echo "$colours" | awk '{$1="";print $0}')
+  done
+  echo -e "$COL_RESET"
+
+  echo "$pass" | tr -d '\n' | xsel -ib
+
+  if [ "$?" ]; then
+    echo "The password has been pushed to your clipboard, you can paste it where you want it"
+  fi
 }

avaiable/00_colours.bash

@@ -1,2 +1 @@
 export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=gasp'
-export PATH=$PATH:/home/tobias/opt/idea-IU-201.8538.31/bin