From f9e0861005a4bc52c04d4060d5dbd55b381f39f0 Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <tjcarter@spiritsubstance.com>
Date: Thu, 12 Apr 2018 00:44:11 -0700
Subject: [PATCH] install.sh, setup.txt->ivan.sh, bump version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Do not put this hash into production without the following one!

As with a2server, I've written a new setup.txt that downloads the entire
a2cloud source tree for installation, which allows the monolithic script
to be broken up into smaller pieces without worrying about that breaking
the web install—but it's not included in this revision so that git can
keep track of the rename of setup.txt to ivan.sh.

Despite the fact there is no 2.0.0 release yet, 1.9 is already so close
that it doesn't give Ivan any breathing room for any patches he wants to
make, so my intention is to skip major version 2 entirely other than for
this transition.  The final release will be given the 3.0.0 version
number.
---
 install.sh                   | 26 ++++++++++++++++++++++++++
 setup/{setup.txt => ivan.sh} |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100755 install.sh
 rename setup/{setup.txt => ivan.sh} (99%)

diff --git a/install.sh b/install.sh
new file mode 100755
index 0000000..dcceadb
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,26 @@
+#! /bin/bash
+# vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh:
+
+# install.sh - a2cloud main installation script
+#
+# To the extent possible under law, T. Joseph Carter and Ivan Drucker have
+# waived all copyright and related or neighboring rights to the a2cloud
+# scripts themselves.  Software used or installed by these scripts is subject
+# to other licenses.  This work is published from the United States.
+
+a2cloudVersion="2.9.0"
+
+# Find the path of our source directory
+a2cSource="$( dirname "${BASH_SOURCE[0]}" )"
+pushd $a2cSource >/dev/null
+a2cSource="$PWD"
+popd >/dev/null
+if [[ ! -f "$a2cSource/.a2cloud_source" ]]; then
+	printf "\na2cloud: cannot find a2cloud source directory in $a2cSource.\n\n"
+	exit 1
+fi
+
+# Run the legacy setup script for anything not yet ported
+if [[ -e "${a2cSource}/setup/ivan.sh" ]]; then
+	"${a2cSource}/setup/ivan.sh" "$@"
+fi
diff --git a/setup/setup.txt b/setup/ivan.sh
similarity index 99%
rename from setup/setup.txt
rename to setup/ivan.sh
index 6c97dbf..2756561 100755
--- a/setup/setup.txt
+++ b/setup/ivan.sh
@@ -1,7 +1,7 @@
 #! /bin/bash
 # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh:
 
-version="1.9.0"
+version="2.9.0"
 adtProVersion="2.0.1"
 a2cScriptURL="https://raw.githubusercontent.com/RasppleII/a2cloud/master"
 a2cBinaryURL="http://blocksfree.com/downloads"