saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1032 from The-Loeki/fix-bashism

Browse source 
Remove <<< bashism
This commit is contained in:
Nicole Thomas 2017-03-09 08:56:11 -07:00 • committed by GitHub
commit adbeb01542
1 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bootstrap-salt.sh
View file

@ -4383,29 +4383,15 @@ install_amazon_linux_ami_deps() {
# Shim to figure out if we're using old (rhel) or new (aws) rpms.
_USEAWS=$BS_FALSE
# See if STABLE_REV is set, if not, then we're a testing, which we'll just default to old way for now.
if [ "$ITYPE" = "stable" ]; then
repo_rev="$STABLE_REV"
else
repo_rev="latest"
fi
# Remove "archive/" from the version
# shellcheck disable=SC2034,SC2039
IFS='.' read -r MAJOR MINOR PATCH <<< "$repo_rev"
# shellcheck disable=SC2034,SC2039
if [[ "$MAJOR" == *"archive/"** ]]; then
# shellcheck disable=SC2034,SC2039
IFS='/' read -r JUNK MAJOR <<< "$MAJOR"
fi
repo_rev="$(echo "${GIT_REV:-$STABLE_REV}" | sed 's|.*\/||g')"
# Do we have versions new enough to use the aws built packages? or default back to rhel/centos 6.
# shellcheck disable=SC2034,SC2039
if [ "$repo_rev" == "latest" ]; then
if echo "$repo_rev" | egrep -q '^(latest|2016\.11)$'; then
_USEAWS=$BS_TRUE
elif [[ ("$MAJOR" -ge "2016" && "$MINOR" -ge "11") || "$MAJOR" -gt "2016" ]]; then
elif echo "$repo_rev" | egrep -q '^[0-9]+$' && [ "$(echo "$repo_rev" | cut -c1-4)" -gt 2016 ]; then
_USEAWS=$BS_TRUE
fi
# We need to install yum-utils before doing anything else when installing on
# Amazon Linux ECS-optimized images. See issue #974.
yum -y install yum-utils