changed -a behavior, text formatting

[charsel.git] / charsel

diff --git a/charsel b/charsel
index b15a1ff4f31fbf204f236d9447bde8fcbc8c57e3..9915519b760131eabca6169189c6dc35dd204e27 100755 (executable)
--- a/charsel
+++ b/charsel
@@ -19,7 +19,7 @@
 
 ########################################################################
 
-VERSION=2.0.1
+VERSION=2.0.3
 
 # Define argument functions
 function usage() {
@@ -29,7 +29,8 @@ A simple terminal character selector
   -l              show installed charfiles
   -d              show readme
   -v              print version
-      --all       include hidden shortcodes
+  -c              check charfile validity
+  -a              include hidden shortcodes
 
 Exit status:
   0    okay,
@@ -49,19 +50,12 @@ function readme() {
   cat /usr/share/doc/charsel/README.md
 }
 
-function invalid_charfile() {
+function missing_charfile() {
   echo "The selected charfile is missing or invalid"
   list
   exit 1
 }
 
-# Check if Xclip is installed
-if [[ -x xclip ]]
-then
-  echo "Please install xclip."
-  exit 4
-fi
-
 # Merge global and local charfiles
 if [[ -d $CHARDIR ]]
 then
@@ -88,8 +82,29 @@ then
   cp -rf /usr/share/charsel/* $CHARDIR
 fi
 
+# Check if charfile exists
+CHARFILE="$CHARDIR/charfiles/$2"
+function existence() {
+  if [[ ! -f $CHARFILE ]]
+  then
+    missing_charfile
+  fi
+}
+
+# VERY basic syntax check
+function validity() {
+  if [[ $(grep , $CHARFILE && grep - $CHARFILE) ]]
+  then
+    echo "valid charfile"
+  else
+    existence
+    echo "invalid charfile"
+    exit 2
+  fi
+}
+
 # Look for arguments
-while getopts ":lhdv" arg
+while getopts ":alchdv" arg
 do
   case ${arg} in
     h)
@@ -108,32 +123,32 @@ do
       echo "charsel" $VERSION
       exit 0
       ;;
+    c)
+      validity
+      exit 0
+      ;;
+    a)
+      SHOWALL="true"
+      ;;
     ?)
       echo "Invalid option"
       usage
       exit 3
       ;;
-    :)
-      break
-      ;;
   esac
 done
 shift $((OPTIND-1))
 
-# Check if charfile exists
+# Redefine charfile and check file validity
 CHARFILE="$CHARDIR/charfiles/$1"
-if [[ ! -f $CHARFILE ]]
-then
-  invalid_charfile
-fi
+existence
+validity
 
-# VERY basic syntax validation
-if [[ $(grep , $CHARFILE && grep - $CHARFILE) ]]
+# Dependency check
+if [[ -x xclip ]]
 then
-  echo "valid charfile"
-else
-  echo "invalid charfile"
-  exit 2
+  echo "Please install xclip."
+  exit 4
 fi
 
 # Define length of shortcode
@@ -144,22 +159,26 @@ LENGTH=$(cat $CHARFILE \
 
 clear
 
+# Define text formatting
+bold=$(tput bold)
+normal=$(tput sgr0)
+
 # Main program
 while true
 do
   # Format output
   echo "*---------*---------------*"
-  echo "| CHARSEL |" $1
+  echo "| ${bold}CHARSEL${normal} |" $1
   echo "*---------*---------------*"
   echo ""
 
-  if [[ $2 == "--all" ]]
+  if [[ $SHOWALL == true ]]
   then
     cat $CHARFILE | sed -e '/^[ \t]*#/d' | tail -n +2 \
-      | column -t -N input,output --output-separator ' | ' --separator ','
+      | column -t -N "input","output" --output-separator ' | ' --separator ','
   else
     cat $CHARFILE | sed -e '/^[ \t]*#/d' | grep -A 100 - | tail -n +2 \
-      | column -t -N input,output --output-separator ' | ' --separator ','
+      | column -t -N "input","output" --output-separator ' | ' --separator ','
   fi
 
   echo ""
@@ -169,7 +188,7 @@ do
   echo "*-------------------------*"
 
   # User input
-  read -p "| input shortcode:   " -N $LENGTH INPUT
+  read -p "| ${bold}input shortcode: ${normal}  " -N $LENGTH INPUT
 
   if [[ $INPUT == ";"* ]] # Semicolon exits
   then