From f5d36494f6e703993a8fa2e016fb3c1f9676a913 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 15 Oct 2023 17:11:51 +0100
Subject: [PATCH] fix: run check_root

check root was never running because of logic in linuxgsm.sh
---
 lgsm/modules/check_root.sh |  2 +-
 linuxgsm.sh                | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lgsm/modules/check_root.sh b/lgsm/modules/check_root.sh
index 81115394a..8fe20764c 100644
--- a/lgsm/modules/check_root.sh
+++ b/lgsm/modules/check_root.sh
@@ -9,7 +9,7 @@ moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 if [ "$(whoami)" == "root" ]; then
 	if [ "${commandname}" != "INSTALL" ]; then
-		fn_print_fail_nl "Do NOT run this script as root!"
+		fn_print_fail_nl "Do NOT run as root!"
 		if [ -d "${lgsmlogdir}" ]; then
 			fn_script_log_fail "${selfname} attempted to run as root."
 		else
diff --git a/linuxgsm.sh b/linuxgsm.sh
index 520373d48..20adc1db6 100755
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@@ -323,17 +323,18 @@ fn_install_file() {
 
 # Prevent LinuxGSM from running as root. Except if doing a dependency install.
 if [ "$(whoami)" == "root" ]; then
-	if [ "${userinput}" == "install" ] || [ "${userinput}" == "auto-install" ] || [ "${userinput}" == "i" ] || [ "${userinput}" == "ai" ]; then
-		if [ "${shortname}" == "core" ]; then
-			echo -e "[ FAIL ] Do NOT run this script as root!"
-			exit 1
+	if [ -f "${modulesdir}/core_modules.sh" ] || [ -f "${modulesdir}/check_root.sh" ] || [ -f "${modulesdir}/core_messages.sh" ]; then
+		if [ "${userinput}" != "install" ] && [ "${userinput}" != "auto-install" ] && [ "${userinput}" != "i" ] && [ "${userinput}" != "ai" ]; then
+			core_modules.sh
+			core_messages.sh
+			fn_ansi_loader
+			check_root.sh
 		fi
-	elif [ ! -f "${modulesdir}/core_modules.sh" ] || [ ! -f "${modulesdir}/check_root.sh" ] || [ ! -f "${modulesdir}/core_messages.sh" ]; then
-		echo -e "[ FAIL ] Do NOT run this script as root!"
-		exit 1
 	else
-		core_modules.sh
-		check_root.sh
+		if [ "${userinput}" != "install" ] && [ "${userinput}" != "auto-install" ] && [ "${userinput}" != "i" ] && [ "${userinput}" != "ai" ]; then
+			echo -e "[ FAIL ] Do NOT run as root!"
+			exit 1
+		fi
 	fi
 fi