From: mainframe98 <k.s.werf@hotmail.com>
Date: Wed, 26 Jul 2017 11:24:48 +0000 (+0200)
Subject: Update the installphp.sh script to use a supported PHP version
X-Git-Tag: 1.31.0-rc.0~1602
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27votes%27%2C%20votes=%27waiting%27%29%20%7D%7D?a=commitdiff_plain;h=096c0cbd7cc17a9513785f6720a453d99c3a555b;p=lhc%2Fweb%2Fwiklou.git

Update the installphp.sh script to use a supported PHP version

It has been stuck on 5.4 since it was added to the repository
in 9e25a8e32e6d. It also contained some typos and updating
the version required multiple changes, so that has been fixed.

Bug: T165079
Change-Id: I30b4d6d0701dc60651d3c07fd364312a78a45800
---

diff --git a/maintenance/dev/installphp.sh b/maintenance/dev/installphp.sh
index d26ffa67f7..1e3d410f14 100755
--- a/maintenance/dev/installphp.sh
+++ b/maintenance/dev/installphp.sh
@@ -12,13 +12,14 @@ if [ "x$PHP" != "x" -a -x "$PHP" ]; then
 	exit 0
 fi
 
-TAR=php5.4-latest.tar.gz
-PHPURL="http://snaps.php.net/$TAR"
+VER=5.6.32
+TAR="php-$VER.tar.gz"
+PHPURL="https://secure.php.net/get/$TAR/from/this/mirror"
 
 cd "$DEV"
 
-echo "Preparing to download and install a local copy of PHP 5.4, note that this can take some time to do."
-echo "If you wish to avoid re-doing this for uture dev installations of MediaWiki we suggest installing php in ~/.mediawiki/php"
+echo "Preparing to download and install a local copy of PHP $VER, note that this can take some time to do."
+echo "If you wish to avoid re-doing this for future dev installations of MediaWiki we suggest installing php in ~/.mediawiki/php"
 echo -n "Install PHP in ~/.mediawiki/php [y/N]: "
 read INSTALLINHOME
 
@@ -31,27 +32,27 @@ case "$INSTALLINHOME" in
 		;;
 esac
 
-# Some debain-like systems bundle wget but not curl, some other systems
+# Some debian-like systems bundle wget but not curl, some other systems
 # like os x bundle curl but not wget... use whatever is available
-echo -n "Downloading PHP 5.4"
+echo -n "Downloading PHP $VER"
 if command -v wget &>/dev/null; then
-	echo "- using wget"
-	wget "$PHPURL"
+	echo " - using wget"
+	wget -O "$TAR" "$PHPURL"
 elif command -v curl &>/dev/null; then
-	echo "- using curl"
-	curl -O "$PHPURL"
+	echo " - using curl"
+	curl "$PHPURL" -L -o "$TAR"
 else
-	echo "- aborting"
+	echo " - aborting"
 	echo "Could not find curl or wget." >&2;
 	exit 1;
 fi
 
-echo "Extracting php 5.4"
+echo "Extracting php $VER"
 tar -xzf "$TAR"
 
-cd php5.4-*/
+cd "php-$VER/"
 
-echo "Configuring and installing php 5.4 in $PREFIX"
+echo "Configuring and installing php $VER in $PREFIX"
 ./configure --prefix="$PREFIX"
 make
 make install