Merge pull request #9 from mateuscomh/release2

Release2.7

Author: mateuscomh

shellPass.sh

@@ -3,79 +3,94 @@
 #------------------------------------------------------------------------------|
 # AUTOR             : Matheus Martins <3mhenrique@gmail.com>
 # HOMEPAGE          : https://github.com/mateuscomh/shellPass
-# DATE/VER.         : 29/08/2020 2.4
+# DATE/VER.         : 29/08/2020 2.7
 # LICENCE           : GPL3
 # SHORT DESC        : Shell Script to generate fast passwords on terminal
-# DEPS              : xclip on GNU/Linux / pbcopy on MacOS
+# DEPS              : xclip in GNU/Linux / pbcopy in MacOS
 
 #------------------------------------------------------------------------------|
 export LANG=C
-VERSION='2.4 by Matheus Martins'
-USAGE="Program to generate on shell passwords whith alpanum on terminal
+VERSION='2.7 by Matheus Martins'
+USAGE="Program to generate on shell random passwords
 ░▒█▀▀▀█░█░░░░█▀▀░█░░█░░▄▀▀▄░█▀▀▄░█▀▀░█▀▀
 ░░▀▀▀▄▄░█▀▀█░█▀▀░█░░█░░█▄▄█░█▄▄█░▀▀▄░▀▀▄
 ░▒█▄▄▄█░▀░░▀░▀▀▀░▀▀░▀▀░█░░░░▀░░▀░▀▀▀░▀▀▀ "
 FECHA='\033[m'
-VERDE='\033[32;1m'
-VERMELHO='\033[31;1m'
-AMARELO='\033[01;33m'
+BOLD=$(tput bold)
+BLINK=$(tput blink)
+ITALIC=$(tput dim)
 MAX=$1
 #----------FUNC-------------------------------------------------------------|
-
-_gerarsenha(){
-if [ -z "$MAX" ] || [ "$MAX" -eq 0 ]; then
+clear
+_getsize(){
+while [[ -z "$MAX" || $MAX == *[^[:digit:]]* || $MAX == 0 ]];  do
   clear
   echo -e "$USAGE \n"
-  echo -e "${VERDE} Enter the QUANTITY of characters for the password or [Q] to quit: ${FECHA}"
+  echo -e "${BOLD} Enter the QUANTITY of characters for the password or [Q] to quit: ${FECHA}"
   read -r MAX
-fi
-
+  [[ $MAX == [qQ] ]] && exit 0
+done
+return 0
+}
+_makepass(){
 case $MAX in
   q|Q)
     echo -e "Quiting..."
     exit 0
     ;;
   ''|*[!0-9]*)
-    echo -e "${VERMELHO} Enter only numbers referring to the SIZE of the password ${FECHA}"
-    return 1
+    echo -e "${BLINK} Invalid option. ${FECHA}"
+    _getsize
     ;;
   [0-9]*)
-    echo -e "${VERDE} Enter the TYPE of password complexity you want: ${FECHA}
-    ${AMARELO} 1 - Password only numbers ${FECHA}
-    ${AMARELO} 2 - Password with LeTtErS and numb3rs ${FECHA}
-    ${AMARELO} 3 - Password with LeTtErS, numb3rs and Speci@l Ch@r@ct&rs ${FECHA}";
-    read -sn 1 TIPO;
+    echo -e "${BOLD} Enter the TYPE of password complexity you want: ${FECHA}
+    ${ITALIC} 1 - Password only numbers ${FECHA}
+    ${ITALIC} 2 - Password with LeTtErS and numb3rs ${FECHA}
+    ${ITALIC} 3 - Password with LeTtErS, numb3rs and Speci@l Ch@r@ct&rs ${FECHA}";
+    read -rsn 1 TIPO;
 
     case "$TIPO" in
+      q|Q)
+        echo -e "Bye.." && exit 0
+        ;;
       ''|*[!0-9]*)
-        echo -e "${VERMELHO} Enter only numbers referring to the TYPE of the password ${FECHA}"
+        echo -e "${BLINK} Enter only numbers referring to the TYPE of the password ${FECHA}"
         return 2
         ;;
       1)
         PASS=$(cat /dev/urandom LC_ALL=C | tr -dc '0-9' | head -c "$MAX")
         command -v xclip > /dev/null && echo -n "$PASS" | xclip -sel copy || echo -n "$PASS" | pbcopy 2> /dev/null
-        echo -e "${VERDE}$PASS${FECHA}"
+        echo -e "${BOLD}$PASS${FECHA}"
         ;;
       2)
       PASS=$(cat /dev/urandom LC_ALL=C | tr -dc 'A-Za-z0-9' | head -c "$MAX")
       command -v xclip > /dev/null && echo -n "$PASS" | xclip -sel copy || echo -n "$PASS" | pbcopy 2> /dev/null
-      echo -e "${VERDE}$PASS${FECHA}"
+      echo -e "${BOLD}$PASS${FECHA}"
       ;;
       3)
         PASS=$(cat /dev/urandom LC_ALL=C |
           tr -dc 'A-Za-z0-9!"#$%&'\''()*+,-./:;<=>?@[\]^_{|}~' | head -c "$MAX")
         command -v xclip > /dev/null && echo -n "$PASS" | xclip -sel copy || echo -n "$PASS" | pbcopy 2> /dev/null
-        echo -e "${VERDE}$PASS${FECHA}"
+        echo -e "${BOLD}$PASS${FECHA}"
         ;;
       *)
-        echo -e "${VERMELHO} Use only the options [1,2,3] ${FECHA}"
+        echo -e "${BLINK} Use only the options [1,2,3] ${FECHA}"
         return 1
         ;;
     esac
 esac
-# write in file
-echo "$(date '+%d/%m/%y %H:%M:%S') - $PASS" >> $(pwd)/history.log
+_writeinfile
+}
+
+_writeinfile(){
+SCRIPT_PATH="${BASH_SOURCE:-$0}"
+ABS_SCRIPT_PATH="$(realpath "${SCRIPT_PATH}")"
+ABS_DIRECTORY="$(dirname "${ABS_SCRIPT_PATH}")"
+echo "$(date '+%d/%m/%y %H:%M:%S') - $PASS" >> $ABS_DIRECTORY/history.log 
+}
 
+_askprint(){
+  read -rn 1 -p "[R]epeat, generate new password [Y/N] or [Q]uit program? [Y/N/R/Q]" OP; echo
 }
 #---------MAIN-------------------------------------------------------------------|
 
@@ -85,28 +100,34 @@ case "$MAX" in
     exit 0
     ;;
   v | -v | --version )
-    echo -e "${VERDE} $VERSION ${FECHA}"
+    echo -e "${BOLD} $VERSION ${FECHA}"
     exit 0
     ;;
   '')
     OP='Y'
     while true; do
       if [[ "$OP" = [yYsS] ]]; then
         MAX=0
-      _gerarsenha
-        read -n 1 -p "Do you want to [R]epeat or generate new password? [Y/N/R]" OP; echo
+      _getsize
+      _makepass
+      _askprint
       elif [[ "$OP" = [rR] ]]; then
-        _gerarsenha
-        read -n 1 -p "Do you want to [R]epeat or generate new password? [Y/N/R]" OP; echo
-      elif [[ "$OP" = [nN] ]]; then
+        _getsize
+        _makepass
+        _askprint
+      elif [[ "$OP" = [nNqQ] ]]; then
+        echo -e "bye.."
         break
       else
-        echo -e "${VERMELHO} Invalid option ${FECHA}"
-        read -n 1 -p "Do you want to [R]epeat or generate new password? [Y/N/R]" OP; echo
+        echo -e "${BLINK} Invalid option ${FECHA}"
+        _askprint
       fi
     done
     ;;
   [0-9]*)
-    _gerarsenha
+    _makepass
+    ;;
+  *[!0-9]*)
+    echo -e "${BOLD} Invalid option, call again. ${FECHA}" && exit 1 
     ;;
 esac