From 47c675858e0d542e957039511111c3d59bc738e8 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 23 Nov 2017 12:39:57 +0000 Subject: [PATCH] make.sh: Refactor renice and root check Signed-off-by: Michael Tremer --- make.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/make.sh b/make.sh index 65ade72b24..b20e7073d4 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 -- 2.39.5