usability fixes

[charsel.git] / charsel

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