X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=charsel;h=56e1fdf244dfd622206370bb0b014baccb10fe8c;hb=fbbee478d81f974898259ba4307c1660fe72758d;hp=adffd273bd12d2b3f3afc32e4b41dae8d36e2a01;hpb=17f712c5288936886131e5d9c11e962c745fe7df;p=charsel.git

diff --git a/charsel b/charsel
index adffd27..56e1fdf 100755
--- a/charsel
+++ b/charsel
@@ -1,95 +1,173 @@
 #!/usr/bin/env bash
 
-# Merge both global and local charfiles
-CHARDIR=~/.cache/charsel
+#######################################################################
+
+# (C) Copyright Armaan Bhojwani, 2020
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+########################################################################
+
+# Define argument functions
+function usage() {
+  echo "Usage: /usr/bin/charsel [OPTION]... [CHARFILE]...
+A simple terminal character selector
+  -h              show this message
+  -l              show installed charfiles
+  -d              show readme
+      --all       include hidden shortcodes
+
+Exit status:
+  0    okay,
+  1    invalid charfile
+  2    usage error/invalid option"
+}
+
+CHARDIR=$HOME/.cache/charsel
+function list() {
+  echo "The following charfiles are installed:"
+  ls $CHARDIR/charfiles
+}
+
+function readme() {
+  cat /usr/share/doc/charsel/README.md
+}
 
-if [[ ! -d $CHARDIR ]]
+function invalid_charfile() {
+  echo "The selected charfile is missing or invalid"
+  list
+  exit 1
+}
+
+# Look for arguments
+while getopts ":lhd" arg
+do
+  case ${arg} in
+    h)
+      usage
+      exit 0
+      ;;
+    l)
+      list
+      exit 0
+      ;;
+    d)
+      readme
+      exit 0
+      ;;
+    ?)
+      echo "Invalid option"
+      usage
+      exit 2
+      ;;
+    :)
+      break
+      ;;
+  esac
+done
+shift $((OPTIND-1))
+
+# Check if Xclip is installed
+if [[ -x xclip ]]
 then
-  mkdir $CHARDIR/
-elif [[ ! "$(ls -A $CHARDIR)" ]]
+  echo "Please install xclip."
+  exit 1
+fi
+
+# Merge global and local charfiles
+if [[ -d $CHARDIR ]]
 then
-  cp -rf /usr/share/charsel/- $CHARDIR/
-  cp -rf $HOME/.local/share/charsel/- $CHARDIR/
+  rm -rf $CHARDIR/*
+else
+  mkdir $CHARDIR
 fi
 
-# Check for user inputs
-if [[ $1 == "list" \
-  || $1 == "-l" \
-  || $1 == "--list" ]]
+LOCALCHARDIR=$HOME/.local/share/charsel/charfiles
+if [[ ! -d $LOCALCHARDIR ]]
 then
-  echo "The following charfiles are installed"
-  ls $CHARDIR/charfiles
-  exit 0
-elif [[ $1 == "help" \
-  || $1 == "-h" \
-  || $1 == "--help" \
-  || $# -ne 1 ]]
+  mkdir -p $LOCALCHARDIR
+fi
+
+localdirfiles=($LOCALCHARDIR/*)
+if [[ ! -z "${#localdirfiles[*]}" ]]
 then
-  cat /usr/share/doc/charsel/README.md
-  exit 0
+  cp -rf $LOCALCHARDIR/../* $CHARDIR
 fi
 
-# Define charfile path
-CHARFILE=$CHARDIR/charfiles/$1
+globaldirfiles=($/usr/share/charfiles/)
+if [[ ! -z "${#globaldirfiles[*]}" ]]
+then
+  cp -rf /usr/share/charsel/* $CHARDIR
+fi
 
+# Check if charfile exists
+CHARFILE="$CHARDIR/charfiles/$1"
 if [[ ! -f $CHARFILE ]]
 then
-  echo "Please enter a valid charfile. You can list installed charfiles with \`charsel list\`"
-  exit 1
+  invalid_charfile
 fi
 
-# Define length of shortcut
+# Define length of shortcode
 LENGTH=$(cat $CHARFILE \
   | cut -f 1 -d ',' -s \
   | wc -L \
   | cut -b 1)
 
-# Clear screen
 clear
 
 # Main program
-while :
+while true
 do
   # Format output
   echo "*---------*---------------*"
-  echo "| CHARSEL | " $1
+  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 ','
+  if [[ $2 == "--all" ]]
+  then
+    cat $CHARFILE | sed -e '/^[ \t]*#/d' | tail -n +2 \
+      | 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 ','
+  fi
 
   echo ""
   echo "*-------------------------*"
   echo "| previous shorcode:" $INPUT
   echo "| previous output:  " $OUTPUT
   echo "*-------------------------*"
-  
+
   # User 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)
+  # Finds line number of shortcode
+  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)
+  # Outputs character selected above
+  OUTPUT=$(cut -f 2 -d ',' -s $CHARFILE | head -$LINENUMBER | tail +$LINENUMBER)
 
-  if [[ $(cut -f 1 -d ',' -s $CHARFILE \
-    | grep -wnc $INPUT) == "0" ]]
+  # Check to see if the shortcode actually exists
+  if [[ $(cut -f 1 -d ',' -s $CHARFILE | grep -wnc $INPUT) == "0" ]]
   then
-    OUTPUT="" 
+    OUTPUT=""
   fi
 
   # Copy output to clipboard
   echo $OUTPUT | xclip -selection clipboard
 
-  # Clear screen
   clear
-
 done