From 6f75afe092e121a62aedc2375222a9b168a484a9 Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <tjcarter@spiritsubstance.com>
Date: Thu, 6 Sep 2018 13:09:57 -0700
Subject: [PATCH] Change a2cSource to top_src

I've started working on a2server basically out of necessity and I'm
trying to reduce diffs with a2cloud for basically identical code, so I'm
changing things like a2cSource to top_src, that way I can reuse blocks
of code more easily without stupid "off by one letter" mistakes.
---
 install.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/install.sh b/install.sh
index 30c1d5a..03b51d2 100755
--- a/install.sh
+++ b/install.sh
@@ -16,12 +16,12 @@ if test "x$BASH" = "x"; then
 fi
 
 # Find the path of our source directory
-a2cSource="$( dirname "${BASH_SOURCE[0]}" )"
-pushd $a2cSource >/dev/null
-a2cSource="$PWD"
+top_src="$( dirname "${BASH_SOURCE[0]}" )"
+pushd $top_src >/dev/null
+top_src="$PWD"
 popd >/dev/null
-if [[ ! -f "$a2cSource/.a2cloud_source" ]]; then
-	printf "\na2cloud: cannot find a2cloud source directory in $a2cSource.\n\n"
+if [[ ! -f "$top_src/.a2cloud_source" ]]; then
+	printf "\na2cloud: cannot find a2cloud source directory in $top_src.\n\n"
 	exit 1
 fi
 
@@ -45,7 +45,7 @@ process_args() {
 process_args "$@"
 
 # FIXME: Show version, changes, config, allow reconfig, etc…
-"$a2cSource/scripts/show_changes"
+"$top_src/scripts/show_changes"
 cat <<EOF
 
 Your system will be set up for a2cloud, providing you with
@@ -72,13 +72,13 @@ if [[ ! $autoAnswerYes ]]; then
 fi
 
 # Fix any mistakes we've made in previous versions
-. "$a2cSource/scripts/fixup"
+. "$top_src/scripts/fixup"
 
 # Install Archive Tools
 # FIXME: Interim refactoring
-. "$a2cSource/scripts/install_archive_tools" $noPicoPkg
+. "$top_src/scripts/install_archive_tools" $noPicoPkg
 
 # Run the legacy setup script for anything not yet ported
-if [[ -e "${a2cSource}/setup/ivan.sh" ]]; then
-	"${a2cSource}/setup/ivan.sh" "$@"
+if [[ -e "${top_src}/setup/ivan.sh" ]]; then
+	"${top_src}/setup/ivan.sh" "$@"
 fi