From c685f0f231899930fa66f6516d9692216fdbd762 Mon Sep 17 00:00:00 2001
From: Dom Rodriguez <shymega@shymega.org.uk>
Date: Tue, 20 Aug 2019 18:08:03 +0100
Subject: [PATCH 1/2] Tidy up and fix lint errors in build scripts

I've tidied up the code in both of the build scripts used for *nix-like
systems, and the macOS/OSX specific build script helper.

This has been tested on Linux with no issues, but this PR will hopefully
indicate if the changes run without issues on macOS as well.

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
---
 clean_build.sh     | 50 ++++++++++++++++++++++++++++++++++------------
 osx_environment.sh |  2 +-
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/clean_build.sh b/clean_build.sh
index fc1065a5..826a270c 100755
--- a/clean_build.sh
+++ b/clean_build.sh
@@ -1,28 +1,52 @@
-#!/bin/sh
-cd "$(dirname $0)" || exit 1
+#!/bin/bash
+
+set -eu # we set this to catch errors and terminate
+
+cd "$(dirname "$0")" || exit 1
+
 # some environments have cmake v2 as 'cmake' and v3 as 'cmake3'
 # check for cmake3 first then fallback to just cmake
-B_CMAKE=`type cmake3 2>/dev/null`
-if [ $? -eq 0 ]; then
-    B_CMAKE=`echo $B_CMAKE | cut -d' ' -f3`
+
+if type cmake3 2>/dev/null; then
+    B_CMAKE=$(command -v "$(echo "$B_CMAKE" | cut -d' ' -f3)")
 else
-    B_CMAKE=cmake
+    B_CMAKE=$(command -v cmake)
 fi
+
 # default build configuration
 B_BUILD_TYPE=${B_BUILD_TYPE:-Debug}
-if [ "$(uname)" = "Darwin" ]; then
+
+if [ "$(uname -s)" = "Darwin" ]; then
     # OSX needs a lot of extra help, poor thing
     # run the osx_environment.sh script to fix paths
-    . ./osx_environment.sh
+    if [ -f "./osx_environment.sh" ]; then
+       . ./osx_environment.sh
+    fi
     B_CMAKE_FLAGS="-DCMAKE_OSX_SYSROOT=$(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 $B_CMAKE_FLAGS"
 fi
+
 # allow local customizations to build environment
-[ -r ./build_env.sh ] && . ./build_env.sh
-B_CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=$B_BUILD_TYPE $B_CMAKE_FLAGS"
+if [ -f "./build_env.sh" ]; then
+    . ./build_env.sh
+fi
+
+set +eu # disable this temporarily
+if [ -n "${B_CMAKE_FLAGS}" ]; then
+    B_CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=$B_BUILD_TYPE ${B_CMAKE_FLAGS}"
+else
+    B_CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=$B_BUILD_TYPE"
+fi
+set -eu # enable this
+
 rm -rf build
 mkdir build || exit 1
 cd build || exit 1
-echo Starting Barrier $B_BUILD_TYPE build...
-$B_CMAKE $B_CMAKE_FLAGS .. || exit 1
+
+echo "Starting Barrier build..."
+echo "Build type: ${B_BUILD_TYPE}"
+
+"$B_CMAKE" "$B_CMAKE_FLAGS" .. || exit 1
+
 make || exit 1
-echo "Build completed successfully"
+
+echo "Build completed successfully."
diff --git a/osx_environment.sh b/osx_environment.sh
index 09fa3479..2073801c 100644
--- a/osx_environment.sh
+++ b/osx_environment.sh
@@ -11,7 +11,7 @@ function check_dir_exists() {
     fi
 }
 
-if [ ! $BARRIER_BUILD_ENV ]; then
+if [ ! "$BARRIER_BUILD_ENV" ]; then
     check_dir_exists '/Applications/Xcode.app' 'Xcode'
 
     printf "Modifying environment for Barrier build...\n"

From 452820eef7d4f081f9ae79a379a62a76c0281dc5 Mon Sep 17 00:00:00 2001
From: Dom Rodriguez <shymega@shymega.org.uk>
Date: Tue, 20 Aug 2019 18:29:17 +0100
Subject: [PATCH 2/2] Interim fix for failed macOS builds

Not ideal, but it might just work. Take two!

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
---
 osx_environment.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osx_environment.sh b/osx_environment.sh
index 2073801c..ae64af7d 100644
--- a/osx_environment.sh
+++ b/osx_environment.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set +eu
+
 # Checks if directory exists, otherwise asks to install package.
 function check_dir_exists() {
     local path=$1