From: Armaan Bhojwani <3fb650a9-b47e-4604-a282-1dd91953b2ee@anonaddy.me>
Date: Mon, 26 Oct 2020 15:28:10 +0000 (-0400)
Subject: Added -n, reorganized flags
X-Git-Url: https://git.armaanb.net/?p=charsel.git;a=commitdiff_plain;h=2ad026b31c824c686a441525a74a09e9ecdbe14a

Added -n, reorganized flags
---

diff --git a/README.md b/README.md
index a5444af..d6b6699 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ It uses a plain-text file known as a "charfile" to define easy to reach shortcut
 ## Dependencies
   * Bash
   * Linux
-  * Xclip
+  * Xclip (using the -n flag bypasses this)
   * A terminal with UTF-8 encoding enabled (most desktop environment's default terminal will be fine)
 
 ## Usage
diff --git a/charsel b/charsel
index cef1746..6fb47d2 100755
--- a/charsel
+++ b/charsel
@@ -21,8 +21,6 @@
 
 VERSION=2.0.7
 
-# Environment variables
-
 # Define argument functions
 function usage() {
   echo "Usage: /usr/bin/charsel [OPTION]... [CHARFILE]...
@@ -34,6 +32,7 @@ A simple terminal character selector
   -h         show this message
   -L         show installed charfiles without the message
   -l         show installed charfiles
+  -n         dont copy character to clipboard, avoids Xclip dependency
   -v         print version
 
 Exit status:
@@ -111,9 +110,23 @@ if [ $# -eq 0 ]; then
   usage
   exit 3
 fi
-while getopts ":baLlchdv" arg
+while getopts ":abcdhlLnv" arg
 do
   case ${arg} in
+    a)
+      SHOWALL="true"
+      ;;
+    b)
+      COLOR="bw"
+      ;;
+    c)
+      validity
+      exit 0
+      ;;
+    d)
+      readme
+      exit 0
+      ;;
     h)
       usage
       exit 0
@@ -127,24 +140,13 @@ do
       list
       exit 0
       ;;
-    d)
-      readme
-      exit 0
-      ;;
+    n)
+      COPY="no"
+      ;; 
     v)
       echo "charsel" $VERSION
       exit 0
       ;;
-    c)
-      validity
-      exit 0
-      ;;
-    a)
-      SHOWALL="true"
-      ;;
-    b)
-      COLOR="bw"
-      ;;
     ?)
       echo "Invalid option"
       usage
@@ -160,10 +162,13 @@ existence
 validity
 
 # Dependency check
-if [[ -x xclip ]]
+if [[ ! $COPY == "no" ]]
 then
-  echo "Please install xclip."
-  exit 4
+  if [[ -x xclip ]]
+  then
+    echo "Please install xclip."
+    exit 4
+  fi
 fi
 
 if [[ $(echo $LANG | grep UTF-8) -ne 0 ]]
@@ -242,7 +247,10 @@ do
     fi
 
     # Copy output to clipboard
-    echo -n $OUTPUT | xclip -selection clipboard
+    if [[ ! $COPY == "no" ]]
+    then
+      echo -n $OUTPUT | xclip -selection clipboard
+    fi
 
     clear
   fi