check for existence of shortcut

[charsel.git] / charsel

diff --git a/charsel b/charsel
index 0934f5e7b18032a2dfdcd2a315acd5a66db7c1c8..adffd273bd12d2b3f3afc32e4b41dae8d36e2a01 100755 (executable)
--- a/charsel
+++ b/charsel
@@ -9,11 +9,13 @@ then
 elif [[ ! "$(ls -A $CHARDIR)" ]]
 then
   cp -rf /usr/share/charsel/- $CHARDIR/
-  cp -rf ~/.local/share/charsel/- $CHARDIR/
+  cp -rf $HOME/.local/share/charsel/- $CHARDIR/
 fi
 
 # Check for user inputs
-if [[ $1 == "list" ]]
+if [[ $1 == "list" \
+  || $1 == "-l" \
+  || $1 == "--list" ]]
 then
   echo "The following charfiles are installed"
   ls $CHARDIR/charfiles
@@ -48,29 +50,42 @@ clear
 # Main program
 while :
 do
-  # Format charfile into table, showing only the shortcuts below the divider in the charfile
+  # Format output
+  echo "*---------*---------------*"
+  echo "| CHARSEL | " $1
+  echo "*---------*---------------*"
+  echo ""
+
   cat $CHARFILE \
+    | sed -e '/^[ \t]*#/d' \
     | grep -A 100 - \
     | tail -n +2 \
     | column -t -N input,output --output-separator ' | ' --separator ','
 
-  # Display previous
-  echo "--------------------------"
-  echo "previous shorcode:" $INPUT
-  echo "previous output:  " $OUTPUT
-  echo "--------------------------"
-
+  echo ""
+  echo "*-------------------------*"
+  echo "| previous shorcode:" $INPUT
+  echo "| previous output:  " $OUTPUT
+  echo "*-------------------------*"
+  
   # User input
-  read -p "input shortcode:   " -N $LENGTH INPUT
+  read -p "| input shortcode:   " -N $LENGTH INPUT
 
   # This can definately be simplifed, but it works fine
   LINENUMBER=$(cut -f 1 -d ',' -s $CHARFILE \
     | grep -wn $INPUT \
     | cut -d : -f 1)
+
   OUTPUT=$(cut -f 2 -d ',' -s $CHARFILE \
     | head -$LINENUMBER \
     | tail +$LINENUMBER)
 
+  if [[ $(cut -f 1 -d ',' -s $CHARFILE \
+    | grep -wnc $INPUT) == "0" ]]
+  then
+    OUTPUT="" 
+  fi
+
   # Copy output to clipboard
   echo $OUTPUT | xclip -selection clipboard