From 3599dc7f766ff6cb9d6999600d07a96a352944e0 Mon Sep 17 00:00:00 2001
From: lw-everestlinux <liamwaldron@everestlinux.org>
Date: Sun, 27 Nov 2022 15:21:45 -0500
Subject: [PATCH] emk

---
 src/emk/emk      | 30 ++++++++++++++++++------------
 src/emk/emk.conf |  9 +++++++++
 2 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100755 src/emk/emk.conf

diff --git a/src/emk/emk b/src/emk/emk
index e53c614..8ab9059 100755
--- a/src/emk/emk
+++ b/src/emk/emk
@@ -17,6 +17,17 @@
 
 #. /etc/emk.conf
 
+am_i_root() {
+	if [[ $(/usr/bin/id -u) -ne 0 ]]; then
+        	printf "emk ${yellow}WARN${reset} | not running emk as root\n"
+        	printf "emk ${yellow}WARN${reset} | THIS MAY PRODUCE UNEXPECTED RESULTS\n"
+        	printf "emk ${yellow}WARN${reset} | however, this is NOT an error\n"
+        	printf "emk ${yellow}WARN${reset} | and should not be treated as such.\n"
+	else
+        	printf "emk ${blue}INFO${reset} | running emk as root\n"
+	fi
+}
+
 case $1 in
 	-h|--help)
 		printf "emk - simple and concise build system\n"
@@ -40,16 +51,11 @@ case $1 in
 				printf "emk ${red}ERR${reset}  | failed to get help from emkfile.\n"
 				exit 1
 			fi
+	;;
+	*)
+		./emkfile $2
+			if [ "$?" != "0" ]; then
+				printf "emk ${red}ERR${reset}  | subproccess finished with non-zero status.\n"
+				exit 1
+			fi	
 esac
-
-# Check for root
-if [[ $(/usr/bin/id -u) -ne 0 ]]; then
-        printf "emk ${yellow}WARN${reset} | not running emk as root\n"
-        printf "emk ${yellow}WARN${reset} | THIS MAY PRODUCE UNEXPECTED RESULTS\n"
-        printf "emk ${yellow}WARN${reset} | however, this is NOT an error\n"
-        printf "emk ${yellow}WARN${reset} | and should not be treated as such.\n"
-else
-        printf "emk ${blue}INFO${reset} | running emk as root\n"
-fi
-
-./emkfile $2
diff --git a/src/emk/emk.conf b/src/emk/emk.conf
new file mode 100755
index 0000000..4ba4542
--- /dev/null
+++ b/src/emk/emk.conf
@@ -0,0 +1,9 @@
+# /etc/emk.conf
+
+# Colors
+export red="\033[1;31m"
+export green="\033[1;32m"
+export blue="\033[1;34m"
+export reset="\033[m"
+
+# end /etc/emk.conf