From 8f443754e934f5ab2fcbebbd0a3ff092f9aca701 Mon Sep 17 00:00:00 2001
From: Raymond Barbiero <raymond.barbiero.dev@gmail.com>
Date: Thu, 31 Jan 2013 11:21:00 -0800
Subject: [PATCH] Replaced `DISTRO_VERSION_NO_DOTS` string slice with
 `DISTRO_MAJOR_VERSION` variable. This should be more future proof.

---
 bootstrap-salt.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index a83b246..61dc8ad 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -518,9 +518,11 @@ echo
 
 # Simplify version naming on functions
 if [ "x${DISTRO_VERSION}" = "x" ]; then
+    DISTRO_MAJOR_VERSION=""
     DISTRO_VERSION_NO_DOTS=""
     PREFIXED_DISTRO_VERSION_NO_DOTS=""
 else
+    DISTRO_MAJOR_VERSION="$(echo $DISTRO_VERSION | sed 's/^\([0-9]*\).*/\1/g')"
     DISTRO_VERSION_NO_DOTS="$(echo $DISTRO_VERSION | tr -d '.')"
     PREFIXED_DISTRO_VERSION_NO_DOTS="_${DISTRO_VERSION_NO_DOTS}"
 fi
@@ -924,9 +926,9 @@ install_centos_stable_deps() {
     else
         EPEL_ARCH=$CPU_ARCH_L
     fi
-    if [ $DISTRO_VERSION_NO_DOTS -gt 4 ] && [ $DISTRO_VERSION_NO_DOTS -lt 6 ]; then
+    if [ $DISTRO_MAJOR_VERSION -eq 5 ]; then
         rpm -Uvh --force http://mirrors.kernel.org/fedora-epel/5/${EPEL_ARCH}/epel-release-5-4.noarch.rpm
-    elif [ $DISTRO_VERSION_NO_DOTS -gt 5 ] && [ $DISTRO_VERSION_NO_DOTS -lt 7 ]; then
+    elif [ $DISTRO_MAJOR_VERSION -eq 6 ]; then
         rpm -Uvh --force http://mirrors.kernel.org/fedora-epel/6/${EPEL_ARCH}/epel-release-6-8.noarch.rpm
     fi
     yum -y update