From 493f51aa5342798b43bf861ce04dab95992694f4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 7 Sep 2018 02:55:31 -0400 Subject: [PATCH] Update ansible-2.6.x --- scripts/ansible-2.6.x | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x index 8239f8cf2..f4847f835 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -50,10 +50,12 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant apt update #apt -y install dirmngr python-pip python-setuptools python-wheel patch apt -y install dirmngr - #echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" \ - # >> /etc/apt/sources.list.d/iiab-ansible.list - echo "deb http://ppa.launchpad.net/ansible/ansible-2.6/ubuntu xenial main" \ - >> /etc/apt/sources.list.d/iiab-ansible.list + if ! 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 "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" \ + # >> /etc/apt/sources.list.d/iiab-ansible.list + echo "deb http://ppa.launchpad.net/ansible/ansible-2.6/ubuntu xenial main" \ + >> /etc/apt/sources.list.d/iiab-ansible.list + fi apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367 fi else @@ -75,13 +77,13 @@ else #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 -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' + elif grep -qx "deb http://ppa.launchpad.net/ansible/ansible-2.6/ubuntu .* main" /etc/apt/sources.list /etc/apt/sources.list.d/*.list; then + echo -e '\nThe latest Ansible 2.6.x will be installed using line "deb http://ppa.launchpad.net/ansible/ansible-2.6/ubuntu ... 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' grep ansible /etc/apt/sources.list /etc/apt/sources.list.d/*.list 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 '\nEXITING: Ansible repo "deb http://ppa.launchpad.net/ansible/ansible-2.6/ubuntu ... 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.' exit 1 fi