]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
make.sh: Use exiterror to end script safely
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 21 May 2018 19:56:58 +0000 (20:56 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 21 May 2018 19:59:06 +0000 (20:59 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
make.sh

diff --git a/make.sh b/make.sh
index 5d71bab789b990a5f6721009af65fbe7613317ca..62708abd66c1fb9b0d15aa6ee331f785f6e4e715 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -862,16 +862,13 @@ fi
 HOST_MEM=$(system_memory)
 
 # Checking host memory, tuning XZ_OPT
-if [ $HOST_MEM -lt 1024 ]; then
-       print_build_stage "Host-Memory: $HOST_MEM MiB"
-       print_build_stage "Not enough host memory (less than 1024 MiB, please consider upgrading)"
-
-       exit 1
-else
-       XZ_MEM="$(( HOST_MEM * 7 / 10 ))MiB"
-       XZ_OPT="-T4 -8 --memory=$XZ_MEM"
+if [ ${HOST_MEM} -lt 1024 ]; then
+       exiterror "You will need more than 1GB or host memory to run the build"
 fi
 
+XZ_MEM="$(( HOST_MEM * 7 / 10 ))MiB"
+XZ_OPT="-T4 -8 --memory=$XZ_MEM"
+
 if [ -n "${BUILD_ARCH}" ]; then
        configure_build "${BUILD_ARCH}"
 else