fixed small bug, rearranged internals

Fixed a small bug where spaces would break grep, also made the system by
which inputs are checked more streamlined

diff --git a/charsel b/charsel
index 6c6fc915e6cdd58f0853be5b141aa00ad9a282dd..b15a1ff4f31fbf204f236d9447bde8fcbc8c57e3 100755 (executable)
--- a/charsel
+++ b/charsel
@@ -19,7 +19,7 @@
 
 ########################################################################
 
-VERSION=2.0.0
+VERSION=2.0.1
 
 # Define argument functions
 function usage() {
@@ -171,27 +171,30 @@ do
   # User input
   read -p "| input shortcode:   " -N $LENGTH INPUT
 
-  # This can definately be simplifed, but it works fine
-  # Finds line number of shortcode
-  LINENUMBER=$(cut -f 1 -d ',' -s $CHARFILE | grep -wn $INPUT | cut -d : -f 1)
-
-  # Outputs character selected above
-  OUTPUT=$(cut -f 2 -d ',' -s $CHARFILE | head -$LINENUMBER | tail +$LINENUMBER)
-
-  # Check to see if the shortcode actually exists
-  if [[ $(cut -f 1 -d ',' -s $CHARFILE | grep -wnc $INPUT) == "0" ]]
-  then
-    OUTPUT=""
-  fi
-
-  if [[ $INPUT == ";"* ]]
+  if [[ $INPUT == ";"* ]] # Semicolon exits
   then
     clear
     exit 0
-  fi
+  elif [[ $INPUT == " "* ]]  # Spaces dont count
+  then
+    OUTPUT=""
+    clear
+  else
+    # Finds line number of shortcode
+    LINENUMBER=$(cut -f 1 -d ',' -s $CHARFILE | grep -wn $INPUT | cut -d : -f 1)
+
+    # Outputs character selected above
+    OUTPUT=$(cut -f 2 -d ',' -s $CHARFILE | head -$LINENUMBER | tail +$LINENUMBER)
 
-  # Copy output to clipboard
-  echo $OUTPUT | xclip -selection clipboard
+    # Check to see if the shortcode actually exists
+    if [[ $(cut -f 1 -d ',' -s $CHARFILE | grep -wnc $INPUT) == "0" ]]
+    then
+      OUTPUT=""
+    fi
 
-  clear
+    # Copy output to clipboard
+    echo $OUTPUT | xclip -selection clipboard
+
+    clear
+  fi
 done