From 123a592f61c062e4613de72cf26bba160697b43a Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <tjcarter@spiritsubstance.com>
Date: Thu, 10 May 2018 10:25:12 -0700
Subject: [PATCH] Move the install confirmation to install.sh

Kept one in ivan.sh because that's currently useful.
---
 install.sh    | 32 ++++++++++++++++++++++++++++++--
 setup/ivan.sh | 13 +++----------
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/install.sh b/install.sh
index 6c2d87b..89c720b 100755
--- a/install.sh
+++ b/install.sh
@@ -11,6 +11,7 @@
 a2cloudVersion="2.9.0"  # Leave this quoted!
 
 noPicoPkg=
+autoAnswerYes=
 
 # Find the path of our source directory
 a2cSource="$( dirname "${BASH_SOURCE[0]}" )"
@@ -26,7 +27,10 @@ process_args() {
 	while [[ $1 ]]; do
 		if [[ $1 == "-c" ]]; then
 			shift
-			noPicoPkg=1
+			noPicoPkg="-c"
+		elif [[ $1 == "-y" ]]; then
+			shift
+			autoAnswerYes="-y"
 		else
 			shift
 		fi
@@ -37,10 +41,34 @@ process_args "$@"
 
 # FIXME: Show version, changes, config, allow reconfig, etc…
 "$a2cSource/scripts/show_changes"
+cat <<EOF
+
+Your system will be set up for a2cloud, providing you with
+mass storage and online access for your Apple II!
+
+If a2cloud is already installed, it will be upgraded to the
+latest version.  It would sure be handy if we had an up to
+date website to send you to for details.  You should harass
+iKarith about that if you haven't recently.
+
+A full installation could take quite awhile on very low-end
+systems like the Raspberry Pi Zero.
+
+Also, some actions will need to be performed as the root
+(administrator) user.  We are assuming you have access to the
+sudo command for that.
+EOF
+if [[ ! $autoAnswerYes ]]; then
+	printf "\nContinue? "
+	read
+	if [[ ${REPLY:0:1} != "Y" && ${REPLY:0:1} != "y" ]]; then
+		[[ $0 == "-bash" ]] && return 2 || exit 2
+	fi
+fi
 
 # Install Archive Tools
 # FIXME: Interim refactoring
-. "$a2cSource/scripts/install_archive_tools" ${noPicoPkg:+-c}
+. "$a2cSource/scripts/install_archive_tools" $noPicoPkg
 
 # Run the legacy setup script for anything not yet ported
 if [[ -e "${a2cSource}/setup/ivan.sh" ]]; then
diff --git a/setup/ivan.sh b/setup/ivan.sh
index a8dab89..043febf 100755
--- a/setup/ivan.sh
+++ b/setup/ivan.sh
@@ -91,16 +91,9 @@ while [[ $1 ]]; do
 done
 
 echo
-echo "Your $fullme will be set up for A2CLOUD, providing you"
-echo "  with mass storage and online access for your Apple II!"
-echo
-echo "If you already have A2CLOUD installed, you will be updated to the"
-echo "  latest version. Check out http://ivanx.com/a2cloud for details."
-echo
-echo "Full installation may take an hour or longer. Updates are usually"
-echo "  much quicker. Type 'a2cloud-setup -h' for installation options."
-echo
-echo "Some actions will be performed as the root user."
+echo "The installation is now inside of ivan.sh. If you haven't passed"
+echo "-y to install.sh, you can stop the installation here if you're"
+echo "just testing stuff outside of ivan.sh."
 if [[ ! $autoAnswerYes ]]; then
 	echo
 	echo -n "Continue? "