diff --git a/iiab-install b/iiab-install index 47100285e..c9c66bbb5 100755 --- a/iiab-install +++ b/iiab-install @@ -16,6 +16,7 @@ if [ ! -f /etc/iiab/local_vars.yml ]; then if [ -f /opt/iiab/iiab/vars/local_vars.yml ]; then echo -e "\nACTION NEEDED: YOUR /opt/iiab/iiab/vars/local_vars.yml IS NO LONGER SUPPORTED.\n" >&2 + echo -e "███████████████████ TO MOVE IT TO THE CORRECT LOCATION, RUN: ███████████████████" >&2 echo -e "██ ██" >&2 echo -e "██ mv /opt/iiab/iiab/vars/local_vars.yml /etc/iiab/local_vars.yml ██" >&2 @@ -24,9 +25,11 @@ if [ ! -f /etc/iiab/local_vars.yml ]; then fi echo -e "\nEXITING: /opt/iiab/iiab/iiab-install REQUIRES /etc/iiab/local_vars.yml\n" >&2 + echo -e "(1) Please read http://wiki.laptop.org/go/IIAB/local_vars.yml to learn more" >&2 echo -e "(2) MIN/MEDIUM/BIG samples are included in /opt/iiab/iiab/vars" >&2 echo -e "(3) NO TIME FOR DETAILS? RUN INTERNET-IN-A-BOX'S FRIENDLY 1-LINE INSTALLER:\n" >&2 + echo -e ' http://download.iiab.io (click on "6.6" or a more recent version!)\n' >&2 #case $OS in @@ -79,8 +82,8 @@ CURR_KERN=`uname -r` echo "Found Kernel "$CURR_KERN"" if [ "$OS" == "raspbian" ] && version_gt $MIN_RPI_KERN $CURR_KERN ; then echo -e "\nEXITING: Kernel "$MIN_RPI_KERN" or higher required with Raspbian." - echo "PLEASE RUN 'apt update' then 'apt install raspberrypi-kernel' then reboot." - echo "IIAB INSTALL INSTRUCTIONS: https://github.com/iiab/iiab/wiki/IIAB-Installation" + echo -e "PLEASE RUN 'apt update' then 'apt install raspberrypi-kernel' then reboot." + echo -e "IIAB INSTALL INSTRUCTIONS: https://github.com/iiab/iiab/wiki/IIAB-Installation" exit 1 fi @@ -100,13 +103,13 @@ if [[ `command -v ansible` ]]; then # "command -v" is POSIX compliant; it echo "Found Ansible "$CURR_ANSIBLE_VER"" fi if version_gt $MIN_ANSIBLE_VER $CURR_ANSIBLE_VER ; then - echo -e "\nEXITING: Ansible "$MIN_ANSIBLE_VER" or higher required." - echo - echo "REMOVE PRIOR VERSIONS using 'apt purge ansible' and/or 'pip uninstall ansible'." - echo "THEN RUN 'scripts/ansible' to install the latest Ansible from PPA or RPM." - echo "'ansible --version' and 'apt -a list ansible' can also be very useful." - echo - echo "IIAB INSTALL INSTRUCTIONS: https://github.com/iiab/iiab/wiki/IIAB-Installation" + echo -e "\nEXITING: Ansible "$MIN_ANSIBLE_VER" or higher required.\n" + + echo -e "REMOVE PRIOR VERSIONS using 'apt purge ansible' and/or 'pip uninstall ansible'." + echo -e "THEN RUN 'scripts/ansible' to install the latest Ansible from PPA or RPM." + echo -e "'ansible --version' and 'apt -a list ansible' can also be very useful.\n" + + echo -e "IIAB INSTALL INSTRUCTIONS: https://github.com/iiab/iiab/wiki/IIAB-Installation" exit 1 fi @@ -140,19 +143,20 @@ if [ -f /etc/iiab/iiab.env ]; then echo "Wrote STAGE=2 (counter) to /etc/iiab/iiab.env" elif [ "$STAGE" -eq 9 ]; then echo -e "\nEXITING: STAGE (counter) in /etc/iiab/iiab.env shows Stage 9 Is Already Done." - echo "Use './iiab-install --reinstall' to force running all Stages 0-9." - echo "Use './iiab-install --debug' to run Stage 0, followed by Stages 3-9." - echo "Use './runrole' to run a single Stage or Role." + echo -e "Use './iiab-install --reinstall' to force running all Stages 0-9." + echo -e "Use './iiab-install --debug' to run Stage 0, followed by Stages 3-9." + echo -e "Use './runrole' to run a single Stage or Role." echo -e "Use './iiab-network' to run Network sections.\n\n" - exit 0 # allows rerunning http://download.iiab.io/6.6/install.txt + exit 0 # allows rerunning http://download.iiab.io/6.7/install.txt fi fi if [ "$STAGE" -lt 2 ] && [ "$1" == "--debug" ]; then echo -e "\n'--debug' *ignored* as STAGE (counter) < 2." fi -echo -e "\nTRY TO RERUN './iiab-install' IF IT FAILS DUE TO CONNECTIVITY ISSUES ETC!" -echo -e "\nRunning local playbooks....Stage 0 will now run....followed by Stages $(($STAGE + 1))-9" +echo -e "\nTRY TO RERUN './iiab-install' IF IT FAILS DUE TO CONNECTIVITY ISSUES ETC!\n" + +echo -e "Running local playbooks....Stage 0 will now run....followed by Stages $(($STAGE + 1))-9" export ANSIBLE_LOG_PATH="$CWD/iiab-install.log"