From 9124128c0d8c8171c805e2c861a3ddc174583e36 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 7 Sep 2018 02:26:24 -0400 Subject: [PATCH] Update ansible-2.6.x --- scripts/ansible-2.6.x | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x index a37e00d6e..54275718e 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -74,13 +74,12 @@ else #elif [[ `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 #elif grep -r ansible /etc/apt; then + # "grep -x" matches whole lines (confirms it's not commented out) elif grep -qx "deb http://ppa.launchpad.net/ansible/ansible-2.6/ubuntu xenial main" /etc/apt/sources.list /etc/apt/sources.list.d/*.list; then - #echo "Ansible repo(s) found within /etc/apt/sources.list*" - #echo -e 'CONSIDER MANUAL INTERVENTION:\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-2.6/ubuntu xenial main" IF YOU WANT THE LATEST ANSIBLE 2.6.x -- AND REMOVE ALL SIMILAR LINES TO ENSURE ANSIBLE UPDATES CLEANLY -- then re-run this script.\n' echo -e '\nThe latest Ansible 2.6.x will be installed using line "deb http://ppa.launchpad.net/ansible/ansible-2.6/ubuntu xenial main" correctly found in /etc/apt/sources.list and/or /etc/apt/sources.list.d/*.list' - echo -e '\nIF OTHER ANSIBLE REPOS ARE ALSO FOUND BELOW, PLEASE MANUALLY REMOVE THEM TO ENSURE ANSIBLE UPDATES CLEANLY: (then re-run this script to be sure!)\n' + echo -e '\nIF *OTHER* ANSIBLE REPOS ARE ALSO FOUND BELOW, PLEASE MANUALLY REMOVE THEM TO ENSURE ANSIBLE UPDATES CLEANLY: (then re-run this script to be sure!)\n' grep ansible /etc/apt/sources.list /etc/apt/sources.list.d/*.list - echo + echo -e '\n' else echo -e '\nEXITING: Ansible repo "deb http://ppa.launchpad.net/ansible/ansible-2.6/ubuntu xenial main" not found in /etc/apt/sources.list or /etc/apt/sources.list.d/*.list:' echo -e '\nPLEASE UNINSTALL ANSIBLE (run "apt purge ansible" or "pip uninstall ansible", depending how Ansible was originally installed) THEN RE-RUN THIS SCRIPT.'