external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-15 04:32:11 +00:00
Code Issues Releases Wiki Activity

"elif ubuntu" must be above "elif debian || raspbian"

Browse source
This commit is contained in:
A Holt 2018-04-05 13:02:59 -04:00 committed by GitHub
parent 9e7b2182fe
commit 4417f8752c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scripts/ansible-2.4.x
View file

@ -39,6 +39,15 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant
pip install ansible==$GOOD_VER --disable-pip-version-check pip install ansible==$GOOD_VER --disable-pip-version-check
# FOUND="true" # FOUND="true"
# FAMILY="olpc" # FAMILY="olpc"
elif (grep -qi ubuntu /etc/lsb-release) || (grep -qi ubuntu /etc/os-release); then
apt -y install python-pip python-setuptools python-wheel patch
#apt-add-repository -y ppa:ansible/ansible
apt-add-repository -y ppa:ansible/ansible-2.4
# FOUND="true"
# FAMILY="debian"
# fi
# if [ ! $FOUND = "true" ]; then
# elif UBUNTU MUST REMAIN ABOVE (as Ubuntu also contains /etc/debian_version, which would trigger the line just below)
elif [ -f /etc/debian_version ] || (grep -qi raspbian /etc/*elease) ; then elif [ -f /etc/debian_version ] || (grep -qi raspbian /etc/*elease) ; then
if ( ! grep -qi ansible /etc/apt/sources.list) && [ ! -f /etc/apt/sources.list.d/ansible ]; then if ( ! grep -qi ansible /etc/apt/sources.list) && [ ! -f /etc/apt/sources.list.d/ansible ]; then
apt -y install dirmngr python-pip python-setuptools python-wheel patch apt -y install dirmngr python-pip python-setuptools python-wheel patch
@ -51,14 +60,6 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant
# FOUND="true" # FOUND="true"
# FAMILY="debian" # FAMILY="debian"
# Parens are optional, but greatly clarify :) # Parens are optional, but greatly clarify :)
elif (grep -qi ubuntu /etc/lsb-release) || (grep -qi ubuntu /etc/os-release); then
apt -y install python-pip python-setuptools python-wheel patch
#apt-add-repository -y ppa:ansible/ansible
apt-add-repository -y ppa:ansible/ansible-2.4
# FOUND="true"
# FAMILY="debian"
# fi
# if [ ! $FOUND = "true" ]; then
else else
echo "WARN: Could not detect distro or distro unsupported" echo "WARN: Could not detect distro or distro unsupported"
exit 1 exit 1