From 77a41faeacb89431af366198eb2bce671b9ff787 Mon Sep 17 00:00:00 2001
From: "Archie Hilton (thytom)" <archie.hilton1@gmail.com>
Date: Wed, 23 Oct 2019 15:14:27 +0100
Subject: [PATCH] Added better error checking in install and dwmbar

---
 dwmbar     | 23 +++++++++++++++++++++++
 install.sh |  5 +++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/dwmbar b/dwmbar
index 84582af..adf2882 100755
--- a/dwmbar
+++ b/dwmbar
@@ -1,6 +1,10 @@
 #!/bin/bash
 VERSION="0.1"
 
+DEFAULT_CONFIG_DIR="/usr/share/dwmbar"
+DEFAULT_MODULES_DIR="$DEFAULT_CONFIG_DIR/modules"
+DEFAULT_RC_LOCATION="$DEFAULT_CONFIG_DIR/dwmbarrc"
+
 RC_LOCATION="/home/$USER/.config/dwmbar/dwmbarrc"
 CONFIG_DIR="/home/$USER/.config/dwmbar"
 MODULES_DIR="$CONFIG_DIR/modules"
@@ -23,6 +27,23 @@ copy_usr_to_home(){
 	[[ ! -d $CACHE_DIR ]] && mkdir $CACHE_DIR
 }
 
+check_files(){
+	if [[ ! -d $DEFAULT_CONFIG_DIR ]]; then
+		echo "$DEFAULT_CONFIG_DIR does not exist." > /dev/stderr
+		exit 1
+	fi
+
+	if [[ ! -d $DEFAULT_MODULES_DIR ]]; then
+		echo "$DEFAULT_MODULES_DIR does not exist." > /dev/stderr
+		exit 1
+	fi
+
+	if [[ ! -f $DEFAULT_RC_LOCATION ]]; then
+		echo "$DEFAULT_RC_LOCATION does not exist." > /dev/stderr
+		exit 1
+	fi
+}
+
 while getopts 'v' flag; do
 	case "${flag}" in
 		v) 	print_help
@@ -32,6 +53,8 @@ while getopts 'v' flag; do
 	esac
 done
 
+check_files
+
 while :; do
 	xsetroot -name "$(exec $RC_LOCATION)"
 done
diff --git a/install.sh b/install.sh
index c110d3d..a77009f 100755
--- a/install.sh
+++ b/install.sh
@@ -3,12 +3,13 @@
 DWMBAR="/usr/bin/dwmbar"
 
 if [ "$EUID" -ne 0 ]
-  then echo "Please run as root"
+  then echo "Please run as root" > /dev/stderr
   exit 1
 fi
 
 if [[ ! -f "dwmbar" ]]; then
-	echo "dwmbar executable not found."
+	echo "dwmbar executable not found." > /dev/stderr
+	exit 1
 fi
 
 # Create /usr/share/dwmbar