From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 23 Nov 2017 12:39:57 +0000 (+0000)
Subject: make.sh: Refactor renice and root check
X-Git-Tag: v2.19-core117~1^2~66
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=658232a64cb4ad1795de44691d64f3ee9f78ea2f;p=people%2Fstevee%2Fipfire-2.x.git

make.sh: Refactor renice and root check

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/make.sh b/make.sh
index def61eaece..1125027759 100755
--- a/make.sh
+++ b/make.sh
@@ -440,18 +440,15 @@ prepareenv() {
 	trap "exiterror 'Build process interrupted'" SIGINT SIGTERM SIGKILL SIGSTOP SIGQUIT
 
 	# Resetting our nice level
-	echo -ne "Resetting our nice level to $NICE" | tee -a $LOGFILE
-	renice $NICE $$ > /dev/null
-	if [ `nice` != "$NICE" ]; then
+	if ! renice ${NICE} $$ >/dev/null; then
 			beautify message FAIL
-			exiterror "Failed to set correct nice level"
+			exiterror "Failed to set nice level to ${NICE}"
 	else
 			beautify message DONE
 	fi
 
 	# Checking if running as root user
-	echo -ne "Checking if we're running as root user" | tee -a $LOGFILE
-	if [ `id -u` != 0 ]; then
+	if [ $(id -u) -ne 0 ]; then
 			beautify message FAIL
 			exiterror "Not building as root"
 	else