update readme, fix -n bug, remove branding

[charsel.git] / charsel

diff --git a/charsel b/charsel
index 800b964b55d63d71183b439088c9c2d051a705f5..d9dcb0f9b2a298c6e123f13bce0d8eba530c4c88 100755 (executable)
--- a/charsel
+++ b/charsel
@@ -1,29 +1,11 @@
 #!/usr/bin/env bash
-
-#######################################################################
-
-# (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/>.
-
-########################################################################
-
-VERSION=2.0.8
+# Charsel - terminal character selector
+# Copyright Armaan Bhojwani 2020, MIT License
 
 # Define argument functions
 function usage() {
   echo "Usage: /usr/bin/charsel [OPTION]... [CHARFILE]...
+
 A simple terminal character selector
   -a         include hidden shortcodes
   -b         disable color support
@@ -33,8 +15,6 @@ A simple terminal character selector
   -L         show installed charfiles without the message
   -l         show installed charfiles
   -n         dont copy character to clipboard, avoids Xclip dependency
-  -V         check for updates
-  -v         print current version
 
 Exit status:
    0         okay,
@@ -44,18 +24,6 @@ Exit status:
    4         other error"
 }
 
-function version_check(){
-  NEW_VERSION=$(curl -s https://codeberg.org/armaan/charsel/raw/branch/master/charsel \
-    | grep VERSION= | tail -c +9)
-  if [[ $VERSION != "$NEW_VERSION" ]]
-  then
-    echo "an update is available"
-  else
-    echo "you are up to date"
-  fi
-
-}
-
 CHARDIR=$HOME/.cache/charsel
 function list() {
   ls "$CHARDIR"/charfiles
@@ -72,44 +40,32 @@ function missing_charfile() {
 }
 
 # Merge global and local charfiles
-if [[ -d $CHARDIR ]]
-then
+if [[ -d $CHARDIR ]]; then
   rm -rf "${CHARDIR:?}"/*
 else
   mkdir "$CHARDIR"
 fi
 
 LOCALCHARDIR=$HOME/.local/share/charsel/charfiles
-if [[ ! -d $LOCALCHARDIR ]]
-then
-  mkdir -p "$LOCALCHARDIR"
-fi
+[[ -d $LOCALCHARDIR ]] || mkdir -p "$LOCALCHARDIR"
 
 localdirfiles="$LOCALCHARDIR"/*
-if [[ -n "${#localdirfiles[*]}" ]]
-then
-  cp -rf "$LOCALCHARDIR"/../* "$CHARDIR"
-fi
+[[ -n "${#localdirfiles[*]}" ]] && cp -rf "$LOCALCHARDIR"/../* "$CHARDIR"
 
 globaldirfiles=($/usr/share/charfiles/)
-if [[ -n "${#globaldirfiles[*]}" ]]
-then
-  cp -rf /usr/share/charsel/* "$CHARDIR"
-fi
+[[ -n "${#globaldirfiles[*]}" ]] && cp -rf /usr/share/charsel/* "$CHARDIR"
 
 # Check if charfile exists
 CHARFILE="$CHARDIR/charfiles/$2"
 function existence() {
-  if [[ ! -f $CHARFILE ]]
-  then
+  if [[ ! -f $CHARFILE ]]; then
     missing_charfile
   fi
 }
 
 # VERY basic syntax check
 function validity() {
-  if [[ $(grep , "$CHARFILE" && grep - "$CHARFILE") ]]
-  then
+  if [[ $(grep , "$CHARFILE" && grep - "$CHARFILE") ]]; then
     echo "valid charfile"
   else
     existence
@@ -151,14 +107,6 @@ do
       ;;
     n)
       COPY="no"
-      ;; 
-    v)
-      echo "charsel" $VERSION
-      exit 0
-      ;;
-    V)
-      version_check
-      exit 0
       ;;
     ?)
       echo "Invalid option"
@@ -174,16 +122,15 @@ if [ $# -eq 0 ]; then
   charsel -l
   exit 3
 fi
+
 # Redefine charfile and check file validity
 CHARFILE="$CHARDIR/charfiles/$1"
 existence
 validity
 
 # Dependency check
-if [[ ! $COPY == "no" ]]
-then
-  if [[ -x xclip ]]
-  then
+if [[ $COPY == "no" ]]; then
+  if [[ ! -x /usr/bin/xclip ]]; then
     echo "Please install xclip."
     exit 4
   fi
@@ -200,12 +147,8 @@ clear
 bold=$(tput bold)
 normal=$(tput sgr0)
 
-if [[ $COLOR == bw ]]
-then
-  magenta=$(tput setaf 7)
-else
-  magenta=$(tput setaf 5)
-fi
+highlight=$(tput setaf 5)
+[[ $COLOR == bw ]] && highlight=$(tput setaf 7)
 
 white=$(tput setaf 7)
 
@@ -214,12 +157,11 @@ while true
 do
   # Format output
   echo "*---------*---------------*"
-  echo "| ${bold}${magenta}CHARSEL${white}${normal} |" "$1"
+  echo "| ${bold}${highlight}CHARSEL${white}${normal} |" "$1"
   echo "*---------*---------------*"
   echo ""
 
-  if [[ $SHOWALL == true ]]
-  then
+  if [[ $SHOWALL == true ]]; then
     sed "$CHARFILE" -e '/^[ \t]*#/d' | tail -n +2 \
       | column -t -N "input","output" --output-separator ' | ' --separator ','
   else
@@ -229,21 +171,16 @@ do
 
   echo ""
   echo "*-------------------------*"
-  echo "| previous shorcode:" "$INPUT"
+  echo "| previous shorcode:" "$(echo $INPUT)"
   echo "| previous output:  " "$OUTPUT"
   echo "*-------------------------*"
 
   # User input
-  read -p "| ${bold}input shortcode: ${normal}  " -N "$LENGTH" INPUT
+  read -r -p "| ${bold}input shortcode: ${normal}  " -N "$LENGTH" INPUT
 
-  if [[ $INPUT == ";"* ]] # Semicolon exts
-  then
+  if [[ $INPUT == ";"* ]]; then # Semicolon exts
     clear
     exit 0
-  elif [[ $INPUT == " "* ]]  # Spaces dont count
-  then
-    OUTPUT=""
-    clear
   else
     # Finds line number of shortcode
     LINENUMBER=$(cut -f 1 -d ',' -s "$CHARFILE" | grep -wn "$INPUT" | cut -d : -f 1)
@@ -252,14 +189,12 @@ do
     OUTPUT=$(cut -f 2 -d ',' -s "$CHARFILE" | head -"$LINENUMBER" | tail +"$LINENUMBER")
 
     # Check to see if the shortcode actually exists
-    if [[ $(cut -f 1 -d ',' -s "$CHARFILE" | grep -wnc "$INPUT") == "0" ]]
-    then
+    if [[ $(cut -f 1 -d ',' -s "$CHARFILE" | grep -wnc "$INPUT") == "0" ]]; then
       OUTPUT=""
     fi
 
     # Copy output to clipboard
-    if [[ ! $COPY == "no" ]]
-    then
+    if [[ ! $COPY == "no" ]]; then
       echo -n "$OUTPUT" | xclip -selection clipboard
     fi