Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Version strings & bash.

Browse source 
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>
This commit is contained in:
Rob Gill 2018-06-05 21:42:42 +10:00 committed by GitHub
parent 13b8e1a2ae
commit a3569d88c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
automated install/basic-install.sh
View file

@ -160,13 +160,19 @@ if command -v apt-get &> /dev/null; then
# use iproute # use iproute
iproute_pkg="iproute" iproute_pkg="iproute"
fi 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 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" 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) fi
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 # Prefer the php metapackage if it's there
if ${PKG_MANAGER} install --dry-run php > /dev/null 2>&1; then if ${PKG_MANAGER} install --dry-run php > /dev/null 2>&1; then
phpVer="php" phpVer="php"
@ -176,8 +182,6 @@ if command -v apt-get &> /dev/null; then
fi fi
else else
# Supported php is installed, its common, cgi & sqlite counterparts are deps # 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" phpVer="php$phpInsMajor.$phpInsMinor"
fi fi
# We also need the correct version for `php-sqlite` (which differs across distros) # We also need the correct version for `php-sqlite` (which differs across distros)