From 68ecf53075687de6aceaac0a16ae1283cf8b15b7 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 25 Sep 2018 14:09:33 -0400
Subject: [PATCH 01/18] Update default_vars.yml

---
 vars/default_vars.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index df8815cd5..ac666d5a3 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -1,7 +1,7 @@
 # WARNING: DO NOT MODIFY THIS FILE.
 # CHANGES WILL BE LOST IF YOU DO A GIT PULL OR FETCH.
 # Instead put changes in your own /etc/iiab/local_vars.yml
-# See http://wiki.iiab.io/local_vars.yml to learn more!
+# PLZ READ http://wiki.laptop.org/go/IIAB/local_vars.yml AND http://FAQ.IIAB.IO
 
 # By convention we use True/False to indicate boolean constants.
 

From d9223f1b3356138de1534bd7a4331703e9b1bcd1 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 25 Sep 2018 14:09:58 -0400
Subject: [PATCH 02/18] Update local_vars_min.yml

---
 vars/local_vars_min.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml
index 1a71b91a5..a61104c56 100644
--- a/vars/local_vars_min.yml
+++ b/vars/local_vars_min.yml
@@ -1,9 +1,7 @@
 # This is local_vars_min.yml -- copy it to /etc/iiab/local_vars.yml then...
+# modify variables below, to override /opt/iiab/iiab/vars/default_vars.yml
 
-# Put variables herein to override /opt/iiab/iiab/vars/default_vars.yml
-
-# PLEASE READ http://wiki.iiab.io/local_vars.yml
-
+# PLZ READ http://wiki.laptop.org/go/IIAB/local_vars.yml AND http://FAQ.IIAB.IO
 # Orig Idea: branch github.com/xsce/xsce-local for your deployment/community
 
 

From c0f91403edf4470b7f2a6c486c0408c7d29bf0b6 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 25 Sep 2018 14:10:04 -0400
Subject: [PATCH 03/18] Update local_vars_medium.yml

---
 vars/local_vars_medium.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml
index a6c4aa0ff..7d04368f5 100644
--- a/vars/local_vars_medium.yml
+++ b/vars/local_vars_medium.yml
@@ -1,9 +1,7 @@
 # This is local_vars_medium.yml -- copy it to /etc/iiab/local_vars.yml then...
+# modify variables below, to override /opt/iiab/iiab/vars/default_vars.yml
 
-# Put variables herein to override /opt/iiab/iiab/vars/default_vars.yml
-
-# PLEASE READ http://wiki.iiab.io/local_vars.yml
-
+# PLZ READ http://wiki.laptop.org/go/IIAB/local_vars.yml AND http://FAQ.IIAB.IO
 # Orig Idea: branch github.com/xsce/xsce-local for your deployment/community
 
 

From 2e36bbc462f782dc2197385987da2a3e3d9dd206 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 25 Sep 2018 14:10:08 -0400
Subject: [PATCH 04/18] Update local_vars_big.yml

---
 vars/local_vars_big.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml
index dcf989fab..243f2dc62 100644
--- a/vars/local_vars_big.yml
+++ b/vars/local_vars_big.yml
@@ -1,9 +1,7 @@
 # This is local_vars_big.yml -- copy it to /etc/iiab/local_vars.yml then...
+# modify variables below, to override /opt/iiab/iiab/vars/default_vars.yml
 
-# Put variables herein to override /opt/iiab/iiab/vars/default_vars.yml
-
-# PLEASE READ http://wiki.iiab.io/local_vars.yml
-
+# PLZ READ http://wiki.laptop.org/go/IIAB/local_vars.yml AND http://FAQ.IIAB.IO
 # Orig Idea: branch github.com/xsce/xsce-local for your deployment/community
 
 

From 2c06ff29a7c319e41943286a4a49d3f9b5166234 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 25 Sep 2018 15:02:03 -0400
Subject: [PATCH 05/18] Update ansible

---
 scripts/ansible | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/scripts/ansible b/scripts/ansible
index 6a70ff781..876ce6863 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -6,11 +6,14 @@ GOOD_VER="2.6.4"    # For XO laptops (pip install) & CentOS (yum install rpm)
     
 export DEBIAN_FRONTEND=noninteractive
 
-echo -e '\n\nSTRONGLY RECOMMENDED PREREQUISITE: (1) remove all prior versions of Ansible using "apt purge ansible" and/or "pip uninstall ansible" and (2) clear out all lines containing ansible from /etc/apt/sources.list and /etc/apt/sources.list.d/*\n'
+echo -e "\n\nSTRONGLY RECOMMENDED PREREQUISITES: (1) remove all prior versions of Ansible"
+echo -e "using 'apt purge ansible' &/or 'pip uninstall ansible' (2) clear out all lines"
+echo -e "containing ansible from /etc/apt/sources.list and /etc/apt/sources.list.d/*\n"
 
-echo -e 'COMPLETE INSTALL INSTRUCTIONS:\nhttps://github.com/iiab/iiab/wiki/IIAB-Installation#do-everything-from-scratch\n'
+echo -e "COMPLETE INSTALL INSTRUCTIONS:"
+echo -e "https://github.com/iiab/iiab/wiki/IIAB-Installation#do-everything-from-scratch\n"
 
-echo -e 'VERIFY YOU'"'"'RE ONLINE BEFORE RUNNING THIS: /opt/iiab/iiab/scripts/ansible'
+echo -e "VERIFY YOU'RE ONLINE BEFORE RUNNING THIS: /opt/iiab/iiab/scripts/ansible"
 echo -e 'Alternative: Run /opt/iiab/iiab/scripts/ansible-2.6.x ("slow food")\n'
 
 if [ $(command -v ansible-playbook) ]; then    # "command -v" is POSIX compliant; also catches built-in commands like "cd"
@@ -21,11 +24,11 @@ if [ $(command -v ansible-playbook) ]; then    # "command -v" is POSIX compliant
         echo "Please use your system's package manager (or pip if nec) 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
 else
-    echo -e 'Ansible NOT found on this computer.'
+    echo -e "Ansible NOT found on this computer!"
     echo -e "INTERNET-IN-A-BOX GENERALLY REQUIRES ANSIBLE VERSION: $GOOD_VER or higher"
 fi
 
@@ -60,7 +63,7 @@ elif [ -f /etc/centos-release ]; then
 #elif [ ! -f /etc/centos-release ] && [ ! -f /etc/fedora-release ] && [ ! -f /etc/olpc-release ]; then
 elif [ -f /etc/debian_version ]; then    # Includes Debian, Ubuntu & Raspbian
 
-    echo -e '\napt update; install dirmngr; PPA to /etc/apt/sources.list.d/iiab-ansible.list\n'
+    echo -e "\napt update; install dirmngr; PPA to /etc/apt/sources.list.d/iiab-ansible.list\n"
     apt update
     apt -y install dirmngr    # Raspbian needs.  Formerly: python-pip python-setuptools python-wheel patch
     echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" \
@@ -69,10 +72,10 @@ elif [ -f /etc/debian_version ]; then    # Includes Debian, Ubuntu & Raspbian
     echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367"\n'
     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367
 
-    echo -e '\napt update; apt install ansible\n'
+    echo -e "\napt update; apt install ansible\n"
     apt update
     apt -y --allow-downgrades install ansible
-    echo -e '\nPlease verify Ansible using "ansible --version" and/or "apt -a list ansible"'
+    echo -e "\nPlease verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n"
 
     # TEMPORARILY USE ANSIBLE 2.4.4 (REMOVE IT WITH "pip uninstall ansible")
     #pip install ansible==2.4.4
@@ -83,8 +86,11 @@ elif [ -f /etc/debian_version ]; then    # Includes Debian, Ubuntu & Raspbian
     #wget http://download.iiab.io/packages/ansible_2.4.2.0-1ppa~xenial_all.deb
     #apt -y --allow-downgrades install ./ansible_2.4.2.0-1ppa~xenial_all.deb
 
-    echo -e '\n\nPPA source "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" successfully saved to /etc/apt/sources.list.d/iiab-ansible.list'
-    echo -e '\nIF *OTHER* ANSIBLE SOURCES APPEAR BELOW, PLEASE MANUALLY REMOVE THEM TO ENSURE ANSIBLE UPDATES CLEANLY: (then re-run this script to be sure!)\n'
+    echo -e 'PPA source "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main"'
+    echo -e "successfully saved to /etc/apt/sources.list.d/iiab-ansible.list\n"
+    
+    echo -e "IF *OTHER* ANSIBLE SOURCES APPEAR BELOW, PLEASE MANUALLY REMOVE THEM TO"
+    echo -e "ENSURE ANSIBLE UPDATES CLEANLY: (then re-run this script to be sure!)\n'
     grep '^deb .*ansible' /etc/apt/sources.list /etc/apt/sources.list.d/*.list | grep -v '^/etc/apt/sources.list.d/iiab-ansible.list:' || true    # Override bash -e (instead of aborting at 1st error)
 else
     echo -e "\nEXITING: Could not detect your OS (unsupported?)\n"

From a890c169a5c203944c24a5d010154f79bcf79bdc Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 25 Sep 2018 15:18:13 -0400
Subject: [PATCH 06/18] Update ansible

---
 scripts/ansible | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/ansible b/scripts/ansible
index 876ce6863..9bed9e139 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -6,16 +6,19 @@ GOOD_VER="2.6.4"    # For XO laptops (pip install) & CentOS (yum install rpm)
     
 export DEBIAN_FRONTEND=noninteractive
 
-echo -e "\n\nSTRONGLY RECOMMENDED PREREQUISITES: (1) remove all prior versions of Ansible"
-echo -e "using 'apt purge ansible' &/or 'pip uninstall ansible' (2) clear out all lines"
-echo -e "containing ansible from /etc/apt/sources.list and /etc/apt/sources.list.d/*\n"
+echo -e "\n\nYOU ARE RUNNING: /opt/iiab/iiab/scripts/ansible"
+echo -e 'Alternative: Run /opt/iiab/iiab/scripts/ansible-2.6.x ("slow food")\n'
+
+echo -e "RECOMMENDED PREREQUISITES:"
+echo -e "(1) Verify you're online"
+echo -e "(2) Remove all prior versions of Ansible using"
+echo -e "    'apt purge ansible' and/or 'pip uninstall ansible'"
+echo -e "(3) Remove all lines containing 'ansible' from"
+echo -e "    /etc/apt/sources.list and /etc/apt/sources.list.d/*\n"
 
 echo -e "COMPLETE INSTALL INSTRUCTIONS:"
 echo -e "https://github.com/iiab/iiab/wiki/IIAB-Installation#do-everything-from-scratch\n"
 
-echo -e "VERIFY YOU'RE ONLINE BEFORE RUNNING THIS: /opt/iiab/iiab/scripts/ansible"
-echo -e 'Alternative: Run /opt/iiab/iiab/scripts/ansible-2.6.x ("slow food")\n'
-
 if [ $(command -v ansible-playbook) ]; then    # "command -v" is POSIX compliant; also catches built-in commands like "cd"
     CURR_VER=`ansible --version | head -1 | awk '{print $2}'`    # To match iiab-install.  Was: CURR_VER=`ansible --version | head -n 1 | cut -f 2 -d " "`
     echo "Currently installed Ansible: $CURR_VER"

From d637444b328a6434d251dc9619b1bd3b9475f051 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 25 Sep 2018 15:33:39 -0400
Subject: [PATCH 07/18] Update ansible-2.6.x

---
 scripts/ansible-2.6.x | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x
index 8ed275a07..dfc610c1c 100755
--- a/scripts/ansible-2.6.x
+++ b/scripts/ansible-2.6.x
@@ -6,13 +6,19 @@ GOOD_VER="2.6.4"    # For XO laptops (pip install) & CentOS (yum install rpm)
     
 export DEBIAN_FRONTEND=noninteractive
 
-echo -e '\n\nSTRONGLY RECOMMENDED PREREQUISITE: (1) remove all prior versions of Ansible using "apt purge ansible" and/or "pip uninstall ansible" and (2) clear out all lines containing ansible from /etc/apt/sources.list and /etc/apt/sources.list.d/*\n'
-
-echo -e 'COMPLETE INSTALL INSTRUCTIONS:\nhttps://github.com/iiab/iiab/wiki/IIAB-Installation#do-everything-from-scratch\n'
-
-echo -e 'VERIFY YOU'"'"'RE ONLINE BEFORE RUNNING THIS: /opt/iiab/iiab/scripts/ansible-2.6.x'
+echo -e "\n\nYOU ARE RUNNING: /opt/iiab/iiab/scripts/ansible-2.6.x"
 echo -e 'Alternative: Run /opt/iiab/iiab/scripts/ansible for the very latest Ansible\n'
 
+echo -e "RECOMMENDED PREREQUISITES:"
+echo -e "(1) Verify you're online"
+echo -e "(2) Remove all prior versions of Ansible using"
+echo -e "    'apt purge ansible' and/or 'pip uninstall ansible'"
+echo -e "(3) Remove all lines containing 'ansible' from"
+echo -e "    /etc/apt/sources.list and /etc/apt/sources.list.d/*\n"
+
+echo -e "COMPLETE INSTALL INSTRUCTIONS:"
+echo -e "https://github.com/iiab/iiab/wiki/IIAB-Installation#do-everything-from-scratch\n"
+
 if [ $(command -v ansible-playbook) ]; then    # "command -v" is POSIX compliant; also catches built-in commands like "cd"
     CURR_VER=`ansible --version | head -1 | awk '{print $2}'`    # To match iiab-install.  Was: CURR_VER=`ansible --version | head -n 1 | cut -f 2 -d " "`
     echo "Currently installed Ansible: $CURR_VER"
@@ -21,11 +27,11 @@ if [ $(command -v ansible-playbook) ]; then    # "command -v" is POSIX compliant
         echo "Please use your system's package manager (or pip if nec) 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
 else
-    echo -e 'Ansible NOT found on this computer.'
+    echo -e "Ansible NOT found on this computer!"
     echo -e "INTERNET-IN-A-BOX GENERALLY REQUIRES ANSIBLE VERSION: $GOOD_VER or higher"
 fi
 
@@ -60,7 +66,7 @@ elif [ -f /etc/centos-release ]; then
 #elif [ ! -f /etc/centos-release ] && [ ! -f /etc/fedora-release ] && [ ! -f /etc/olpc-release ]; then
 elif [ -f /etc/debian_version ]; then    # Includes Debian, Ubuntu & Raspbian
 
-    echo -e '\napt update; install dirmngr; PPA to /etc/apt/sources.list.d/iiab-ansible.list\n'
+    echo -e "\napt update; install dirmngr; PPA to /etc/apt/sources.list.d/iiab-ansible.list\n"
     apt update
     apt -y install dirmngr    # Raspbian needs.  Formerly: python-pip python-setuptools python-wheel patch
     echo "deb http://ppa.launchpad.net/ansible/ansible-2.6/ubuntu xenial main" \
@@ -69,10 +75,10 @@ elif [ -f /etc/debian_version ]; then    # Includes Debian, Ubuntu & Raspbian
     echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367"\n'
     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367
 
-    echo -e '\napt update; apt install ansible\n'
+    echo -e "\napt update; apt install ansible\n"
     apt update
     apt -y --allow-downgrades install ansible
-    echo -e '\nPlease verify Ansible using "ansible --version" and/or "apt -a list ansible"'
+    echo -e "\nPlease verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n"
 
     # TEMPORARILY USE ANSIBLE 2.4.4 (REMOVE IT WITH "pip uninstall ansible")
     #pip install ansible==2.4.4
@@ -83,8 +89,11 @@ elif [ -f /etc/debian_version ]; then    # Includes Debian, Ubuntu & Raspbian
     #wget http://download.iiab.io/packages/ansible_2.4.2.0-1ppa~xenial_all.deb
     #apt -y --allow-downgrades install ./ansible_2.4.2.0-1ppa~xenial_all.deb
 
-    echo -e '\n\nPPA source "deb http://ppa.launchpad.net/ansible/ansible-2.6/ubuntu xenial main" successfully saved to /etc/apt/sources.list.d/iiab-ansible.list'
-    echo -e '\nIF *OTHER* ANSIBLE SOURCES ARE ALSO IN THE LIST BELOW, PLEASE MANUALLY REMOVE THEM TO ENSURE ANSIBLE UPDATES CLEANLY: (then re-run this script to be sure!)\n'
+    echo -e 'PPA source "deb http://ppa.launchpad.net/ansible/ansible-2.6/ubuntu xenial main"'
+    echo -e "successfully saved to /etc/apt/sources.list.d/iiab-ansible.list\n"
+    
+    echo -e "IF *OTHER* ANSIBLE SOURCES APPEAR BELOW, PLEASE MANUALLY REMOVE THEM TO"
+    echo -e "ENSURE ANSIBLE UPDATES CLEANLY: (then re-run this script to be sure!)\n'
     grep '^deb .*ansible' /etc/apt/sources.list /etc/apt/sources.list.d/*.list | grep -v '^/etc/apt/sources.list.d/iiab-ansible.list:' || true    # Override bash -e (instead of aborting at 1st error)
 else
     echo -e "\nEXITING: Could not detect your OS (unsupported?)\n"

From 971433484c8c20ed7641f16c8c42377d8ba57999 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 25 Sep 2018 16:07:52 -0400
Subject: [PATCH 08/18] Update ansible

---
 scripts/ansible | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/scripts/ansible b/scripts/ansible
index 9bed9e139..9b1fb9ffc 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -6,7 +6,7 @@ GOOD_VER="2.6.4"    # For XO laptops (pip install) & CentOS (yum install rpm)
     
 export DEBIAN_FRONTEND=noninteractive
 
-echo -e "\n\nYOU ARE RUNNING: /opt/iiab/iiab/scripts/ansible"
+echo -e "\n\nYOU ARE RUNNING: /opt/iiab/iiab/scripts/ansible (TO INSTALL ANSIBLE)"
 echo -e 'Alternative: Run /opt/iiab/iiab/scripts/ansible-2.6.x ("slow food")\n'
 
 echo -e "RECOMMENDED PREREQUISITES:"
@@ -21,21 +21,20 @@ echo -e "https://github.com/iiab/iiab/wiki/IIAB-Installation#do-everything-from-
 
 if [ $(command -v ansible-playbook) ]; then    # "command -v" is POSIX compliant; also catches built-in commands like "cd"
     CURR_VER=`ansible --version | head -1 | awk '{print $2}'`    # To match iiab-install.  Was: CURR_VER=`ansible --version | head -n 1 | cut -f 2 -d " "`
-    echo "Currently installed Ansible: $CURR_VER"
-    echo -e "INTERNET-IN-A-BOX GENERALLY REQUIRES ANSIBLE VERSION: $GOOD_VER or higher"
+    echo -e "CURRENTLY INSTALLED ANSIBLE: $CURR_VER -- LET'S TRY TO UPGRADE IT!""
+    echo -e "(Internet-in-a-Box requests Ansible $GOOD_VER or higher)\n"
     if [ -f /etc/centos-release ] || [ -f /etc/fedora-release ]; then
-        echo "Please use your system's package manager (or pip if nec) to update Ansible."
+        echo "Please use your system's package manager (or pip if nec) to update Ansible.\n"
         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.\n"
         exit 0
     fi
 else
-    echo -e "Ansible NOT found on this computer!"
-    echo -e "INTERNET-IN-A-BOX GENERALLY REQUIRES ANSIBLE VERSION: $GOOD_VER or higher"
+    echo -e "ANSIBLE NOT FOUND ON THIS COMPUTER -- LET'S TRY TO INSTALL IT!"
+    echo -e "(Internet-in-a-Box requests Ansible $GOOD_VER or higher)\n"
 fi
 
-echo -e 'scripts/ansible will now try to install the very latest Ansible...\n'
 if [ -f /etc/olpc-release ]; then
     yum -y install ca-certificates nss
     yum -y install git bzip2 file findutils gzip hg svn sudo tar which unzip xz zip libselinux-python

From aa4b79befba5d6026d0f1a695c4dd1da61e7eeb2 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 25 Sep 2018 16:12:21 -0400
Subject: [PATCH 09/18] Update ansible

---
 scripts/ansible | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ansible b/scripts/ansible
index 9b1fb9ffc..101d98dac 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -7,7 +7,7 @@ GOOD_VER="2.6.4"    # For XO laptops (pip install) & CentOS (yum install rpm)
 export DEBIAN_FRONTEND=noninteractive
 
 echo -e "\n\nYOU ARE RUNNING: /opt/iiab/iiab/scripts/ansible (TO INSTALL ANSIBLE)"
-echo -e 'Alternative: Run /opt/iiab/iiab/scripts/ansible-2.6.x ("slow food")\n'
+echo -e 'Alternative: Run /opt/iiab/iiab/scripts/ansible-2.6.x ("Slow Food")\n'
 
 echo -e "RECOMMENDED PREREQUISITES:"
 echo -e "(1) Verify you're online"

From ab6f3ca8b4f5a802de08fa02ec3dbcfd2898579c Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 25 Sep 2018 16:15:16 -0400
Subject: [PATCH 10/18] Update ansible-2.6.x

---
 scripts/ansible-2.6.x | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x
index dfc610c1c..2dd1146b4 100755
--- a/scripts/ansible-2.6.x
+++ b/scripts/ansible-2.6.x
@@ -6,8 +6,8 @@ GOOD_VER="2.6.4"    # For XO laptops (pip install) & CentOS (yum install rpm)
     
 export DEBIAN_FRONTEND=noninteractive
 
-echo -e "\n\nYOU ARE RUNNING: /opt/iiab/iiab/scripts/ansible-2.6.x"
-echo -e 'Alternative: Run /opt/iiab/iiab/scripts/ansible for the very latest Ansible\n'
+echo -e "\n\nYOU ARE RUNNING: /opt/iiab/iiab/scripts/ansible-2.6.x (TO INSTALL ANSIBLE)"
+echo -e 'Alternative: Run /opt/iiab/iiab/scripts/ansible ("for the very latest Ansible")\n'
 
 echo -e "RECOMMENDED PREREQUISITES:"
 echo -e "(1) Verify you're online"
@@ -21,21 +21,20 @@ echo -e "https://github.com/iiab/iiab/wiki/IIAB-Installation#do-everything-from-
 
 if [ $(command -v ansible-playbook) ]; then    # "command -v" is POSIX compliant; also catches built-in commands like "cd"
     CURR_VER=`ansible --version | head -1 | awk '{print $2}'`    # To match iiab-install.  Was: CURR_VER=`ansible --version | head -n 1 | cut -f 2 -d " "`
-    echo "Currently installed Ansible: $CURR_VER"
-    echo -e "INTERNET-IN-A-BOX GENERALLY REQUIRES ANSIBLE VERSION: $GOOD_VER or higher"
+    echo -e "CURRENTLY INSTALLED ANSIBLE: $CURR_VER -- LET'S TRY TO UPGRADE IT!""
+    echo -e "(Internet-in-a-Box requests Ansible $GOOD_VER or higher)\n"
     if [ -f /etc/centos-release ] || [ -f /etc/fedora-release ]; then
-        echo "Please use your system's package manager (or pip if nec) to update Ansible."
+        echo "Please use your system's package manager (or pip if nec) to update Ansible.\n"
         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.\n"
         exit 0
     fi
 else
-    echo -e "Ansible NOT found on this computer!"
-    echo -e "INTERNET-IN-A-BOX GENERALLY REQUIRES ANSIBLE VERSION: $GOOD_VER or higher"
+    echo -e "ANSIBLE NOT FOUND ON THIS COMPUTER -- LET'S TRY TO INSTALL IT!"
+    echo -e "(Internet-in-a-Box requests Ansible $GOOD_VER or higher)\n"
 fi
 
-echo -e 'scripts/ansible-2.6.x will now try to install Ansible 2.6.x...\n'
 if [ -f /etc/olpc-release ]; then
     yum -y install ca-certificates nss
     yum -y install git bzip2 file findutils gzip hg svn sudo tar which unzip xz zip libselinux-python

From 2a80a3e510bae4c16052c2c6ba94fb2adaedfe36 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 25 Sep 2018 16:33:52 -0400
Subject: [PATCH 11/18] Update ansible

---
 scripts/ansible | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ansible b/scripts/ansible
index 101d98dac..dd33a7604 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -21,7 +21,7 @@ echo -e "https://github.com/iiab/iiab/wiki/IIAB-Installation#do-everything-from-
 
 if [ $(command -v ansible-playbook) ]; then    # "command -v" is POSIX compliant; also catches built-in commands like "cd"
     CURR_VER=`ansible --version | head -1 | awk '{print $2}'`    # To match iiab-install.  Was: CURR_VER=`ansible --version | head -n 1 | cut -f 2 -d " "`
-    echo -e "CURRENTLY INSTALLED ANSIBLE: $CURR_VER -- LET'S TRY TO UPGRADE IT!""
+    echo -e "CURRENTLY INSTALLED ANSIBLE: $CURR_VER -- LET'S TRY TO UPGRADE IT!"
     echo -e "(Internet-in-a-Box requests Ansible $GOOD_VER or higher)\n"
     if [ -f /etc/centos-release ] || [ -f /etc/fedora-release ]; then
         echo "Please use your system's package manager (or pip if nec) to update Ansible.\n"

From 094727e06d5ebff2df4343d22075c135340d95b6 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 25 Sep 2018 16:34:04 -0400
Subject: [PATCH 12/18] Update ansible-2.6.x

---
 scripts/ansible-2.6.x | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x
index 2dd1146b4..1866416a5 100755
--- a/scripts/ansible-2.6.x
+++ b/scripts/ansible-2.6.x
@@ -21,7 +21,7 @@ echo -e "https://github.com/iiab/iiab/wiki/IIAB-Installation#do-everything-from-
 
 if [ $(command -v ansible-playbook) ]; then    # "command -v" is POSIX compliant; also catches built-in commands like "cd"
     CURR_VER=`ansible --version | head -1 | awk '{print $2}'`    # To match iiab-install.  Was: CURR_VER=`ansible --version | head -n 1 | cut -f 2 -d " "`
-    echo -e "CURRENTLY INSTALLED ANSIBLE: $CURR_VER -- LET'S TRY TO UPGRADE IT!""
+    echo -e "CURRENTLY INSTALLED ANSIBLE: $CURR_VER -- LET'S TRY TO UPGRADE IT!"
     echo -e "(Internet-in-a-Box requests Ansible $GOOD_VER or higher)\n"
     if [ -f /etc/centos-release ] || [ -f /etc/fedora-release ]; then
         echo "Please use your system's package manager (or pip if nec) to update Ansible.\n"

From c9044a7d2d5ec10b5b93f0a893455302f38d6103 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 25 Sep 2018 16:35:01 -0400
Subject: [PATCH 13/18] Update ansible

---
 scripts/ansible | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ansible b/scripts/ansible
index dd33a7604..9bc9671d1 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -92,7 +92,7 @@ elif [ -f /etc/debian_version ]; then    # Includes Debian, Ubuntu & Raspbian
     echo -e "successfully saved to /etc/apt/sources.list.d/iiab-ansible.list\n"
     
     echo -e "IF *OTHER* ANSIBLE SOURCES APPEAR BELOW, PLEASE MANUALLY REMOVE THEM TO"
-    echo -e "ENSURE ANSIBLE UPDATES CLEANLY: (then re-run this script to be sure!)\n'
+    echo -e "ENSURE ANSIBLE UPDATES CLEANLY: (then re-run this script to be sure!)\n"
     grep '^deb .*ansible' /etc/apt/sources.list /etc/apt/sources.list.d/*.list | grep -v '^/etc/apt/sources.list.d/iiab-ansible.list:' || true    # Override bash -e (instead of aborting at 1st error)
 else
     echo -e "\nEXITING: Could not detect your OS (unsupported?)\n"

From 6e934a5c3c0a38f357efdf4f1140740ebdb316e7 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 25 Sep 2018 16:35:20 -0400
Subject: [PATCH 14/18] Update ansible-2.6.x

---
 scripts/ansible-2.6.x | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x
index 1866416a5..9d0204700 100755
--- a/scripts/ansible-2.6.x
+++ b/scripts/ansible-2.6.x
@@ -92,7 +92,7 @@ elif [ -f /etc/debian_version ]; then    # Includes Debian, Ubuntu & Raspbian
     echo -e "successfully saved to /etc/apt/sources.list.d/iiab-ansible.list\n"
     
     echo -e "IF *OTHER* ANSIBLE SOURCES APPEAR BELOW, PLEASE MANUALLY REMOVE THEM TO"
-    echo -e "ENSURE ANSIBLE UPDATES CLEANLY: (then re-run this script to be sure!)\n'
+    echo -e "ENSURE ANSIBLE UPDATES CLEANLY: (then re-run this script to be sure!)\n"
     grep '^deb .*ansible' /etc/apt/sources.list /etc/apt/sources.list.d/*.list | grep -v '^/etc/apt/sources.list.d/iiab-ansible.list:' || true    # Override bash -e (instead of aborting at 1st error)
 else
     echo -e "\nEXITING: Could not detect your OS (unsupported?)\n"

From 1f8634356d31f5e35de2184b594b2dde25161622 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 25 Sep 2018 16:43:04 -0400
Subject: [PATCH 15/18] Update ansible

---
 scripts/ansible | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ansible b/scripts/ansible
index 9bc9671d1..2bfa9267e 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -7,7 +7,7 @@ GOOD_VER="2.6.4"    # For XO laptops (pip install) & CentOS (yum install rpm)
 export DEBIAN_FRONTEND=noninteractive
 
 echo -e "\n\nYOU ARE RUNNING: /opt/iiab/iiab/scripts/ansible (TO INSTALL ANSIBLE)"
-echo -e 'Alternative: Run /opt/iiab/iiab/scripts/ansible-2.6.x ("Slow Food")\n'
+echo -e 'Alternative:     /opt/iiab/iiab/scripts/ansible-2.6.x ("Slow Food")\n'
 
 echo -e "RECOMMENDED PREREQUISITES:"
 echo -e "(1) Verify you're online"

From 2b869201780b9b7eb0cada884a7f4e9a1ca1bab9 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 25 Sep 2018 16:43:22 -0400
Subject: [PATCH 16/18] Update ansible-2.6.x

---
 scripts/ansible-2.6.x | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x
index 9d0204700..aa9d82a75 100755
--- a/scripts/ansible-2.6.x
+++ b/scripts/ansible-2.6.x
@@ -7,7 +7,7 @@ GOOD_VER="2.6.4"    # For XO laptops (pip install) & CentOS (yum install rpm)
 export DEBIAN_FRONTEND=noninteractive
 
 echo -e "\n\nYOU ARE RUNNING: /opt/iiab/iiab/scripts/ansible-2.6.x (TO INSTALL ANSIBLE)"
-echo -e 'Alternative: Run /opt/iiab/iiab/scripts/ansible ("for the very latest Ansible")\n'
+echo -e 'Alternative:     /opt/iiab/iiab/scripts/ansible ("for the very latest Ansible")\n'
 
 echo -e "RECOMMENDED PREREQUISITES:"
 echo -e "(1) Verify you're online"

From dc8c33116e51e98ab4abcbce432cb4bcb8671e7a Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 25 Sep 2018 16:49:09 -0400
Subject: [PATCH 17/18] Update ansible

---
 scripts/ansible | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ansible b/scripts/ansible
index 2bfa9267e..cf9be0a68 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -77,7 +77,7 @@ elif [ -f /etc/debian_version ]; then    # Includes Debian, Ubuntu & Raspbian
     echo -e "\napt update; apt install ansible\n"
     apt update
     apt -y --allow-downgrades install ansible
-    echo -e "\nPlease verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n"
+    echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n"
 
     # TEMPORARILY USE ANSIBLE 2.4.4 (REMOVE IT WITH "pip uninstall ansible")
     #pip install ansible==2.4.4

From bb09c5cf54234930e9505de4badd2200670b2ed0 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 25 Sep 2018 16:49:50 -0400
Subject: [PATCH 18/18] Update ansible-2.6.x

---
 scripts/ansible-2.6.x | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x
index aa9d82a75..a645b6e7d 100755
--- a/scripts/ansible-2.6.x
+++ b/scripts/ansible-2.6.x
@@ -77,7 +77,7 @@ elif [ -f /etc/debian_version ]; then    # Includes Debian, Ubuntu & Raspbian
     echo -e "\napt update; apt install ansible\n"
     apt update
     apt -y --allow-downgrades install ansible
-    echo -e "\nPlease verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n"
+    echo -e "\nSUCCESS: verify Ansible using 'ansible --version' and/or 'apt -a list ansible'\n\n"
 
     # TEMPORARILY USE ANSIBLE 2.4.4 (REMOVE IT WITH "pip uninstall ansible")
     #pip install ansible==2.4.4