fixed small bug, rearranged internals

[charsel.git] / charsel

diff --git a/charsel b/charsel
index c274ef84a53beee3aedad859a1093c6ad23c19ee..b15a1ff4f31fbf204f236d9447bde8fcbc8c57e3 100755 (executable)
--- a/charsel
+++ b/charsel
@@ -19,6 +19,8 @@
 
 ########################################################################
 
+VERSION=2.0.1
+
 # Define argument functions
 function usage() {
   echo "Usage: /usr/bin/charsel [OPTION]... [CHARFILE]...
@@ -26,6 +28,7 @@ A simple terminal character selector
   -h              show this message
   -l              show installed charfiles
   -d              show readme
+  -v              print version
       --all       include hidden shortcodes
 
 Exit status:
@@ -86,7 +89,7 @@ then
 fi
 
 # Look for arguments
-while getopts ":lhd" arg
+while getopts ":lhdv" arg
 do
   case ${arg} in
     h)
@@ -101,6 +104,10 @@ do
       readme
       exit 0
       ;;
+    v)
+      echo "charsel" $VERSION
+      exit 0
+      ;;
     ?)
       echo "Invalid option"
       usage
@@ -164,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)
 
-  # Copy output to clipboard
-  echo $OUTPUT | xclip -selection clipboard
+    # Outputs character selected above
+    OUTPUT=$(cut -f 2 -d ',' -s $CHARFILE | head -$LINENUMBER | tail +$LINENUMBER)
 
-  clear
+    # Check to see if the shortcode actually exists
+    if [[ $(cut -f 1 -d ',' -s $CHARFILE | grep -wnc $INPUT) == "0" ]]
+    then
+      OUTPUT=""
+    fi
+
+    # Copy output to clipboard
+    echo $OUTPUT | xclip -selection clipboard
+
+    clear
+  fi
 done