Sorry for commit spam, added grep -w flag

[charsel.git] / charsel

diff --git a/charsel b/charsel
index dc2564f54921231b4803486ff72d168389fc5650..4bb18b497e71cbf657ea171cc7032d585e4209ca 100755 (executable)
--- a/charsel
+++ b/charsel
@@ -1,25 +1,50 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 # Merge both global and local charfiles
-CHARDIR=/tmp/charsel
-cp /usr/share/charsel/* $CHARDIR
-cp ~/.local/share/charsel/* $CHARDIR
+CHARDIR=~/.cache/charsel
 
-# Check if user provided a charfile
-[ -z "$1" ] && echo "No argument supplied"  && exit 1
+if [[ ! -d $CHARDIR ]]
+then
+  mkdir $CHARDIR/
+elif [[! "$(ls -A $CHARDIR)"]]
+then
+  cp -rf /usr/share/charsel/* $CHARDIR/
+  cp -rf ~/.local/share/charsel/* $CHARDIR/
+fi
+
+# Check for user inputs
+if [ $1 = "list" ]
+then
+  echo "The following charfiles are installed"
+  ls $CHARDIR/charfiles
+  exit
+elif [[ $1 = "help" || $1 = "-h" || $1 = "--help" || $# -ne 1 ]]
+then
+  cat /usr/share/doc/charsel/README.md
+  exit
+else
 
 # Clear screen
 clear
 
+# Define charfile path
+CHARFILE=$CHARDIR/charfiles/$1
+
+# Define length of shortcut
+LENGTH=$(cat $CHARFILE | cut -f 1 -d ',' -s | wc -L | cut -b 1)
+
+# Main program
 while :
 do
-  
-  # Put charfile into table
-  column -t $CHARDIR/$1 -N SHORT,CHAR -R SHORT,CHAR --output-separator ' | '
-  read -n 1 INPUT
-  
-  # Navigate to the right characther
-  OUTPUT=$(grep $INPUT $CHARDIR/$1 | cut -c 3)
+  # Put charfile into table, showing only the shortcuts below the divider in the charfile
+  cat $CHARFILE | grep -A 100 - | tail -n +2 | column -t  --output-separator ' | ' --separator ','
+
+  # Automatically enter input
+  read -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)
 
   # Clear screen
   clear
@@ -27,3 +52,5 @@ do
   # Copy output to clipboard
   echo $OUTPUT | xclip -selection clipboard
 done
+
+fi