From 489c55d988aa86b0dbc7ea4132ec43bb2d30cfa8 Mon Sep 17 00:00:00 2001
From: "Joshua A. Horton" <joshua_horton@sil.org>
Date: Tue, 27 Jun 2023 10:50:14 +0700
Subject: [PATCH] fix(ios): forgot to adjust include paths for build-utils.sh

---
 ios/engine/build.sh            | 4 +++-
 ios/keyman/build.sh            | 2 +-
 ios/samples/KMSample1/build.sh | 4 +++-
 ios/samples/KMSample2/build.sh | 4 +++-
 ios/samples/build_common.sh    | 2 +-
 oem/firstvoices/ios/build.sh   | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ios/engine/build.sh b/ios/engine/build.sh
index fdd8250733..74df0eca5f 100755
--- a/ios/engine/build.sh
+++ b/ios/engine/build.sh
@@ -3,9 +3,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*/*}/../resources/build/build-utils.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
+exit 1
+
 # This script runs from its own folder
 cd "$(dirname "$THIS_SCRIPT")"
 
diff --git a/ios/keyman/build.sh b/ios/keyman/build.sh
index d37b162d2a..571210ecab 100755
--- a/ios/keyman/build.sh
+++ b/ios/keyman/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*/*}/../resources/build/build-utils.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # This script runs from its own folder
diff --git a/ios/samples/KMSample1/build.sh b/ios/samples/KMSample1/build.sh
index 21e79a79e6..75791d6560 100755
--- a/ios/samples/KMSample1/build.sh
+++ b/ios/samples/KMSample1/build.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
 
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+
 TARGET=KMSample1
-source ../build_common.sh
+source "${THIS_SCRIPT%/*}/../build_common.sh"
diff --git a/ios/samples/KMSample2/build.sh b/ios/samples/KMSample2/build.sh
index a0ad47b501..79d02d9a95 100755
--- a/ios/samples/KMSample2/build.sh
+++ b/ios/samples/KMSample2/build.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
 
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+
 TARGET=KMSample2
-source ../build_common.sh
+source "${THIS_SCRIPT%/*}/../build_common.sh"
\ No newline at end of file
diff --git a/ios/samples/build_common.sh b/ios/samples/build_common.sh
index 62a44af19f..c419756fc5 100755
--- a/ios/samples/build_common.sh
+++ b/ios/samples/build_common.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*/*}/../resources/build/build-utils.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # TODO:  resolve how this is sourced by scripts in subfolders;
diff --git a/oem/firstvoices/ios/build.sh b/oem/firstvoices/ios/build.sh
index 0bbd1e0e13..89b912fd25 100755
--- a/oem/firstvoices/ios/build.sh
+++ b/oem/firstvoices/ios/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*/*/*}/../resources/build/build-utils.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # Include our resource functions; they're pretty useful!