From a3569d88c95ed2dae32753ffa25fab3a217e5f5b Mon Sep 17 00:00:00 2001
From: Rob Gill <rrobgill@protonmail.com>
Date: Tue, 5 Jun 2018 21:42:42 +1000
Subject: [PATCH] Version strings & bash.

Fixed up the version checking. Thanks for your help @dschaper.

No longer uses the version string as returned, but uses the major and minor version numbers extracted from it, against the minimum of 5.5.

Tested against real install of php 7.0, (and the version check logic separately tested against a variety of artificial version numbers, of multiple digits for both major and minor version. - Lesson learned, I'm never trusting bash again)

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
---
 automated install/basic-install.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index a4869d24..67cd3a4c 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -160,13 +160,19 @@ if command -v apt-get &> /dev/null; then
     # use iproute
     iproute_pkg="iproute"
   fi
-  # Check for and determine version number, major and minor of current php install
+  # Check for and determine version number (major and minor) of current php install
   if command -v php &> /dev/null; then
-    phpInsVersion="$(php -v | head -n1 | grep -Po '(?<PHP )[^ ]+')"
+    phpInsVersion="$(php -v | head -n1 | grep -Po '(?<=PHP )[^ ]+')"
     echo -e "  ${INFO} Existing PHP installation detected : PHP version $phpInsVersion"
+    phpInsMajor="$(echo "$phpInsVersion" | cut -d\. -f1)"
+    phpInsMinor="$(echo "$phpInsVersion" | cut -d\. -f2)"
+    # Is installed php version supported? (php 5.4 is EOL)
+    if [ "$(echo "$phpInsMajor.$phpInsMinor < 5.5" | bc )" == 0 ]; then
+      phpInsSupported=true
+    fi
   fi
-  # Check if installed php is supported version (5.4 is EOL)
-  if [[ "$phpInsVersion" < "5.5" ]]; then
+  # Check if installed php is unsupported version (5.4 is EOL)
+  if [[ "$phpInsSupported" != true ]]; then
     # Prefer the php metapackage if it's there
     if ${PKG_MANAGER} install --dry-run php > /dev/null 2>&1; then
       phpVer="php"
@@ -176,8 +182,6 @@ if command -v apt-get &> /dev/null; then
     fi
   else
     # Supported php is installed, its common, cgi & sqlite counterparts are deps
-    phpInsMajor="$(echo "$phpInsVersion" | cut -d\. -f1)"
-    phpInsMinor="$(echo "$phpInsVersion" | cut -d\. -f2)"
     phpVer="php$phpInsMajor.$phpInsMinor"
   fi
   # We also need the correct version for `php-sqlite` (which differs across distros)