From ab6f3ca8b4f5a802de08fa02ec3dbcfd2898579c Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 25 Sep 2018 16:15:16 -0400 Subject: [PATCH] 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