mirror of
https://github.com/iiab/iiab.git
synced 2025-03-09 15:40:17 +00:00
"elif ubuntu" must be above "elif debian || raspbian"
This commit is contained in:
parent
3801a6a2e4
commit
51cb7d6432
1 changed files with 6 additions and 19 deletions
|
@ -7,8 +7,6 @@ echo -e 'OR: consider scripts/ansible to keep up-to-date with Ansible'"'"'s evol
|
|||
GOOD_VER="2.5.0" # Ansible version for OLPC XO laptops (pip install).
|
||||
# On other OS's we attempt to install/upgrade/pin to the latest Ansible 2.5.x
|
||||
CURR_VER="undefined"
|
||||
# FOUND="false" # NOT USED AS OF 2017-12-12
|
||||
# FAMILY="undefined" # NOT USED AS OF 2017-12-12
|
||||
# below are unused for future use
|
||||
# URL="NA"
|
||||
|
||||
|
@ -21,23 +19,23 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant
|
|||
yum -y install git bzip2 file findutils gzip hg svn sudo tar which unzip xz zip libselinux-python
|
||||
yum -y install python-pip python-setuptools python-wheel patch
|
||||
yum -y install http://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ansible-2.5.0-1.el7.ans.noarch.rpm
|
||||
# FOUND="true"
|
||||
# FAMILY="redhat"
|
||||
# elif [ -f /etc/fedora-release ]; then
|
||||
# CURR_VER=`grep VERSION_ID /etc/*elease | cut -d= -f2`
|
||||
# URL=https://github.com/jvonau/iiab/blob/ansible/vars/fedora-$CURR_VER.yml
|
||||
# dnf -y install ansible git bzip2 file findutils gzip hg svn sudo tar which unzip xz zip libselinux-python
|
||||
# dnf -y install python-pip python-setuptools python-wheel patch
|
||||
# FOUND="true"
|
||||
# FAMILY="redhat"
|
||||
elif [ -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
|
||||
yum -y install python-pip python-setuptools python-wheel patch
|
||||
pip install --upgrade pip setuptools wheel #EOL just do it
|
||||
pip install ansible==$GOOD_VER --disable-pip-version-check
|
||||
# FOUND="true"
|
||||
# FAMILY="olpc"
|
||||
# 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.5
|
||||
# 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
|
||||
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
|
||||
|
@ -47,17 +45,6 @@ if [ ! `command -v ansible-playbook` ]; then # "command -v" is POSIX compliant
|
|||
>> /etc/apt/sources.list.d/iiab-ansible.list
|
||||
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367
|
||||
fi
|
||||
# FOUND="true"
|
||||
# FAMILY="debian"
|
||||
# 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.5
|
||||
# FOUND="true"
|
||||
# FAMILY="debian"
|
||||
# fi
|
||||
# if [ ! $FOUND = "true" ]; then
|
||||
else
|
||||
echo "WARN: Could not detect distro or distro unsupported"
|
||||
exit 1
|
||||
|
|
Loading…
Add table
Reference in a new issue