From 7aa8feee172c0870779c0df2c7c10f5982b0580c Mon Sep 17 00:00:00 2001
From: Andrew Best <festivus+git@gmail.com>
Date: Sun, 29 Aug 2021 20:58:31 +1000
Subject: [PATCH] re-order things in the install.sh, trying to find the Exit
 command which is killing us.

---
 hostbuild/macos-desktop-build.sh |  2 +-
 install.sh                       | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/hostbuild/macos-desktop-build.sh b/hostbuild/macos-desktop-build.sh
index 8066275..106bb10 100644
--- a/hostbuild/macos-desktop-build.sh
+++ b/hostbuild/macos-desktop-build.sh
@@ -958,5 +958,5 @@ set -o pipefail
 # Run your script
 mainScript
 
-# Exit cleanly
+### Exit cleanly
 safeExit
diff --git a/install.sh b/install.sh
index 8e2a332..8110b88 100755
--- a/install.sh
+++ b/install.sh
@@ -7,14 +7,6 @@
 # * pulls the necessary files
 # * runs the build
 
-function doTheNeedful { # Our main.
-  # invoke verbose usage when set
-  if ${verbose}; then v="-v"; fi
-
-  # Work out what OS we're running only
-  detectOS
-}
-
 ## SET SCRIPTNAME VARIABLE ##
 scriptName=$(basename "$0")
 
@@ -57,6 +49,14 @@ function safeExit() {
   exit
 }
 
+function doTheNeedful { # Our main.
+  # invoke verbose usage when set
+  if ${verbose}; then v="-v"; fi
+
+  # Work out what OS we're running only
+  detectOS
+}
+
 # Bash will remember & return the highest exitcode in a chain of pipes.
 # This way you can catch the error in case mysqldump fails in `mysqldump |gzip`, for example.
 set -o pipefail