From 6fb6a068e25bb14759a4ee118acd63c563248d6f Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <tjcarter@spiritsubstance.com>
Date: Sun, 22 Apr 2018 13:54:15 -0700
Subject: [PATCH] ivan.sh now properly requires a2cSource to be set

Now a2cloud matches a2server in requiring that ivan.sh be run from a
source tree.  That'll always be true when running the installation using
the approved methods, including the web install upgrade.
---
 setup/ivan.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/setup/ivan.sh b/setup/ivan.sh
index 55378f8..2181e3b 100755
--- a/setup/ivan.sh
+++ b/setup/ivan.sh
@@ -6,13 +6,14 @@ adtProVersion="2.0.1"
 a2cScriptURL="https://raw.githubusercontent.com/RasppleII/a2cloud/master"
 a2cBinaryURL="http://blocksfree.com/downloads"
 
+# Find the path of our source directory
 a2cDevel="$( dirname "${BASH_SOURCE[0]}" )/.."
-if [[ -f "$a2cDevel/.a2cloud_source" ]]; then
-	pushd $a2cDevel >/dev/null
-	a2cDevel="$PWD"
-	popd >/dev/null
-else
-	a2cDevel=
+pushd $a2cDevel >/dev/null
+a2cDevel="$PWD"
+popd >/dev/null
+if [[ ! -f "$a2cDevel/.a2cloud_source" ]]; then
+	printf "\na2cloud: cannot find a2cloud source directory in $a2cDevel.\n\n"
+	exit 1
 fi
 
 useExternalURL=1