Apple-2-Tools/a2cloud
1
0
Fork 0
mirror of https://github.com/RasppleII/a2cloud.git synced 2024-11-29 17:49:30 +00:00
Code Issues Projects Releases Wiki Activity

Move the install confirmation to install.sh

Browse Source 
Kept one in ivan.sh because that's currently useful.
This commit is contained in:
T. Joseph Carter 2018-05-10 10:25:12 -07:00
parent 38d2808d9a
commit 123a592f61
2 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
install.sh
View File

@ -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

13
setup/ivan.sh
View File

@ -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? "