added comment support to charfile, beutification

[charsel.git] / charsel

diff --git a/charsel b/charsel
index 114394719a8a9d231940e924fb0a5afd48661394..a8b5e66c5771848ae71e6dcd4fda322a19afd076 100755 (executable)
--- a/charsel
+++ b/charsel
@@ -9,16 +9,21 @@ 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
   exit 0
-elif [[ $1 == "help" || $1 == "-h" || $1 == "--help" || $# -ne 1 ]]
+elif [[ $1 == "help" \
+  || $1 == "-h" \
+  || $1 == "--help" \
+  || $# -ne 1 ]]
 then
   cat /usr/share/doc/charsel/README.md
   exit 0
@@ -34,7 +39,10 @@ then
 fi
 
 # Define length of shortcut
-LENGTH=$(cat $CHARFILE | cut -f 1 -d ',' -s | wc -L | cut -b 1)
+LENGTH=$(cat $CHARFILE \
+  | cut -f 1 -d ',' -s \
+  | wc -L \
+  | cut -b 1)
 
 # Clear screen
 clear
@@ -42,20 +50,34 @@ clear
 # Main program
 while :
 do
-  # 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 ','
-
-  # Print a separator
+  # Format output
+  echo "*---------*---------------*"
+  echo "| CHARSEL | " $1
+  echo "*---------*---------------*"
   echo ""
-  echo "--------------------------"
-  echo "enter the input shortcode here:"
 
+  cat $CHARFILE \
+    | sed -e '/^[ \t]*#/d' \
+    | grep -A 100 - \
+    | tail -n +2 \
+    | column -t -N input,output --output-separator ' | ' --separator ','
+
+  echo ""
+  echo "*-------------------------*"
+  echo "| previous shorcode:" $INPUT
+  echo "| previous output:  " $OUTPUT
+  echo "*-------------------------*"
+  
   # User input
-  read -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)
+  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