Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-24 13:50:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2220 from rrobgill/installedphpcheck

Browse source 
Bugfix - Check version of installed php
This commit is contained in:
Mark Drobnak 2018-06-08 23:31:40 -04:00 committed by GitHub
commit 0651f1bcd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
automated install/basic-install.sh
View file

@ -160,13 +160,29 @@ if command -v apt-get &> /dev/null; then
# use iproute # use iproute
iproute_pkg="iproute" iproute_pkg="iproute"
fi fi
# We prefer the php metapackage if it's there # Check for and determine version number (major and minor) of current php install
if ${PKG_MANAGER} install --dry-run php > /dev/null 2>&1; then if command -v php &> /dev/null; then
phpVer="php" phpInsVersion="$(php -v | head -n1 | grep -Po '(?<=PHP )[^ ]+')"
# If not, echo -e " ${INFO} Existing PHP installation detected : PHP version $phpInsVersion"
else phpInsMajor="$(echo "$phpInsVersion" | cut -d\. -f1)"
phpInsMinor="$(echo "$phpInsVersion" | cut -d\. -f2)"
# Is installed php version 7.0 or greater
if [ "$(echo "$phpInsMajor.$phpInsMinor < 7.0" | bc )" == 0 ]; then
phpInsNewer=true
fi
fi
# Check if installed php is v 7.0, or newer to determine packages to install
if [[ "$phpInsNewer" != true ]]; then
# Prefer the php metapackage if it's there
if ${PKG_MANAGER} install --dry-run php > /dev/null 2>&1; then
phpVer="php"
# fall back on the php5 packages # fall back on the php5 packages
phpVer="php5" else
phpVer="php5"
fi
else
# Newer php is installed, its common, cgi & sqlite counterparts are deps
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)
if ${PKG_MANAGER} install --dry-run ${phpVer}-sqlite3 > /dev/null 2>&1; then if ${PKG_MANAGER} install --dry-run ${phpVer}-sqlite3 > /dev/null 2>&1; then