From 10acc65a056585794e255734a83b6232bcc0a4a8 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Mon, 27 Apr 2020 06:15:33 -0500
Subject: Fix install error return in non-airlock case and slight cleanup.

---
 scripts/install.sh | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'scripts')

diff --git a/scripts/install.sh b/scripts/install.sh
index 92d81574..cac8b237 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -92,7 +92,7 @@ do
   fi
 done
 
-[ -z "$AIRLOCK" ] && exit 0
+[ -z "$AIRLOCK" ] && exit $EXIT
 
 # --airlock creates a single directory you can point the $PATH to for cross
 # compiling, which contains just toybox and symlinks to toolchain binaries.
@@ -111,13 +111,10 @@ PENDING="dd diff expr ftpd less tr vi wget awk sh sha512sum sha256sum unxz xzcat
 # "gcc" should go away for llvm, but some things still hardwire it
 TOOLCHAIN="as cc ld gcc objdump"
 
-if [ ! -z "$AIRLOCK" ]
-then
-
-  # Tools needed to build packages
-  for i in $TOOLCHAIN $PENDING $HOST_EXTRA
-  do
-    if [ ! -f "$i" ]
+# Tools needed to build packages
+for i in $TOOLCHAIN $PENDING $HOST_EXTRA
+do
+  if [ ! -f "$i" ]
   then
     # Loop through each instance, populating fallback directories (used by
     # things like distcc, which require multiple instances of the same binary
@@ -145,8 +142,4 @@ then
   fi
 done
 
-
-
-fi
-
 exit $EXIT
-- 
cgit v1.2.3