From 164b9d5a697db9050c419fe136784d38a6f641b9 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Wed, 20 Jun 2018 09:56:30 -0400
Subject: [PATCH] Warnings Strengthened

---
 scripts/ansible | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/ansible b/scripts/ansible
index 433b60427..943acf317 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -53,20 +53,21 @@ if [ ! `command -v ansible-playbook` ]; then   # "command -v" is POSIX compliant
 else
     #CURR_VER=`ansible --version | head -n 1 | cut -f 2 -d " "`
     CURR_VER=`ansible --version | head -1 | awk '{print $2}'`  # to match iiab-install
-    echo "Current ansible version installed is $CURR_VER"
+    echo "Currently installed Ansible version is $CURR_VER"
+    echo "Internet-in-a-Box generally requires Ansible version $GOOD_VER or higher."
     if [ -f /etc/centos-release ] || [ -f /etc/fedora-release ]; then
-        echo "Please use your system's package manager to update ansible"
+        echo "Please use your system's package manager (or pip if necessary) to update Ansible."
         exit 0
     elif [ -f /etc/olpc-release ]; then
-        echo "Please use pip package manager to update ansible"
+        echo "Please use pip package manager to update Ansible."
         exit 0
     #fi
     #if [[ `grep -qi ansible /etc/apt/sources.list` ]] || [ -f /etc/apt/sources.list.d/ansible*.list ]; then
     elif (grep -qi ansible /etc/apt/sources.list) || (ls /etc/apt/sources.list.d/*ansible*.list >/dev/null 2>&1) ; then
         #echo "Ansible repo(s) found within /etc/apt/sources.list*"
-        echo -e '\nMANUAL INTERVENTION URGED: ANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" IF YOU WANT THE LATEST RELEASED VERSION OF ANSIBLE -- then re-run this script.\n'
+        echo -e '\nMANUAL INTERVENTION URGED:\nANSIBLE REPO(S) FOUND WITHIN /etc/apt/sources.list AND/OR /etc/apt/sources.list.d/*ansible*.list -- MUST CONTAIN LINE "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" IF YOU WANT THE LATEST RELEASED VERSION OF ANSIBLE -- then re-run this script.\n'
     else
-        echo "Upstream ansible source repo not found, please uninstall ansible and re-run this script"
+        echo -e '\nUpstream ansible source repo not found:\nPLEASE UNINSTALL ANSIBLE (run "apt purge ansible" or "pip uninstall ansible", depending how Ansible was originally installed) THEN RE-RUN THIS SCRIPT.'
         exit 1
     fi
 fi