Update to version 2016.10.0

cloudflare · Oct 31, 2016 · 1076a03 · 1076a03 · glensc · Aug 17, 2017
1 parent d294ed9
commit 1076a03
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,7 @@
-* Aut 05 2016 CloudFlare Inc <[email protected]> - 2016.8.0
+* Oct 24 2016 CloudFlare Inc <[email protected]> - 2016.10.0
+- Change OS detection for EasyApache 4 installer to work with CentOS < 7
+
+* Aug 05 2016 CloudFlare Inc <[email protected]> - 2016.8.0
 - Updated CloudFlare IPv6 ranges
 - Support for installing on EasyApache4
 

diff --git a/EasyApache/installer.sh b/EasyApache/installer.sh
@@ -38,13 +38,11 @@ function install_ea3 {
 function install_ea4 {
 
     #
-    # Reasonably reliable way to get OS distribution name and version
+    # Get OS version from redhat-release
     #
-    DISTRO_NAME=`cat /etc/os-release | grep "^NAME" | sed 's/NAME="//' | sed 's/"//'`
-    DISTRO_VERSION=`cat /etc/os-release | grep "^VERSION_ID" | sed 's/VERSION_ID="//' | sed 's/"//'`
+    DISTRO_NAME=`cat /etc/redhat-release | awk {'print$1'}`
+    DISTRO_VERSION=`cat /etc/redhat-release | sed -e 's/.*release \(.*\) (.*)/\1/' -e 's/\..*//'`
 
-    # Remove trailing minor version
-    DISTRO_VERSION=`sed "s/\..*//" <<<"$DISTRO_VERSION"`
 
     if [[ $DISTRO_VERSION == "6" || $DISTRO_VERSION == "7" ]]; then
     echo

diff --git a/VERSION b/VERSION
@@ -1,3 +1,3 @@
 MAJOR=2016
-MINOR=8
+MINOR=10
 BUILD=0