1.0 release!

diff --git a/INSTALL b/INSTALL
index c7eb02e31043fa440710f1b71e215116e0c6db0e..74dd1d8fbd619a43dc6a6c97e83aadf4496e09dd 100755 (executable)
--- a/INSTALL
+++ b/INSTALL
@@ -4,11 +4,14 @@ mkdir /tmp/charsel/
 chmod 777 /tmp/charsel/
 
 # Makes charsel executeable
-chmod +x charsel
+chmod +x src/charsel
+
+# Makes local folder
+mkdir -p ~/.local/share/charsel/charfiles/
 
 # 2 sets of commands for whether it is root or not
 if [ `whoami` == root ]; then
-  mkdir -p /usr/share/charsel/charfiles
+  mkdir -p /usr/share/charsel/charfiles/
   cp charfiles/* /usr/share/charsel/charfiles/
   mkdir /usr/share/doc/charsel
   cp README.md /usr/share/doc/charsel/
@@ -16,8 +19,7 @@ if [ `whoami` == root ]; then
   cp src/charsel /usr/bin/
   exit
 else
-  mkdir -p ~/.local/share/charsel/charfiles
-  cp charfiles/* ~/.local/share/charsel/charfiles
+  cp charfiles/* ~/.local/share/charsel/charfiles/
   cp src/motd ~/.local/share/charsel/
   cp src/charsel ~/.local/bin/
   exit

diff --git a/README.md b/README.md
index 03f2646c7e38fb4209b8e686d880d55b013c7808..e6849412424d7692a8cdcbe5ff257c6f1087a8b5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -28,6 +28,9 @@ Make a new file in `~/.local/share/charsel/` or `/usr/share/charsel` with the na
 Fill it in, using the provided examples as a template. Hidden shortcuts go above the '---'
 
 ## LICENSE
-charfile is GPLv3 licensed, see COPYING for more information
+Charfile is GNU GPLv3 licensed, see COPYING for more information
  
-charfile is written by [Armaan Bhojwani](https://armaan.bhojwani.org), [Email](mailto:3fb650a9-b47e-4604-a282-1dd91953b2ee@anonaddy.me)
+Charfile is written by [Armaan Bhojwani](https://armaan.bhojwani.org), [Email](mailto:3fb650a9-b47e-4604-a282-1dd91953b2ee@anonaddy.me)
+
+## BRANCHES
+Development happens on the "development" branch, which then gets merged into the "master" branch once its ready for a stable release

diff --git a/src/charsel b/src/charsel
index fe185a4676406434d3ec7d81f73d9a38ab92b72a..80909d3f2751f49aa0fb01836801cefb0238954a 100755 (executable)
--- a/src/charsel
+++ b/src/charsel
@@ -17,21 +17,22 @@
 # Merge both global and local charfiles
 CHARDIR=/tmp/charsel
 cp -R /usr/share/charsel/* $CHARDIR/
-cp -R ~/.local/share/* $CHARDIR/
-
-# Clear screen
-clear
+cp -R ~/.local/share/charsel/* $CHARDIR/
 
 # Check if user provided an input
-[ -z "$1" ] && echo "No argument supplied"  && exit
-
 if [ $1 = "list" ]; then
   echo "The following charfiles are installed"
   ls $CHARDIR/charfiles
   exit
+elif [[ $1 = "help" || $1 = "-h" || $1 = "--help" || $# -ne 1 ]]; then
+  cat /usr/share/doc/charsel/README.md
+  exit
 else
 
-# Define charfile
+# Clear screen
+clear
+
+# Define charfile path
 CHARFILE=$CHARDIR/charfiles/$1
 
 # Define length of shortcut

diff --git a/src/motd b/src/motd
index f95b67e6c76002443ae45b1974b9712a37b6362d..fc1ed3af14e30c9510f2af1ad626b441ba69e432 100644 (file)
--- a/src/motd
+++ b/src/motd
@@ -1,2 +1,4 @@
 WELCOME TO CHARSEL!
-FOR HELP, PLEASE REFER TO /usr/share/doc/charsel/README.md
+FOR HELP, PLEASE USE `charsel help`
+THIS PROGRAM IS GNU GPLv3 LICENSED. SEE https://www.gnu.org/licenses/gpl-3.0.en.html
+