Merge "Add 'autocomplete' option to HTMLTextField"

[lhc/web/wiklou.git] / maintenance / dev / start.sh

diff --git a/maintenance/dev/start.sh b/maintenance/dev/start.sh
index 43b2dae..dd7363a 100755 (executable)
--- a/maintenance/dev/start.sh
+++ b/maintenance/dev/start.sh
@@ -3,14 +3,7 @@
 if [ "x$BASH_SOURCE" == "x" ]; then echo '$BASH_SOURCE not set'; exit 1; fi
 DEV=$(cd -P "$(dirname "${BASH_SOURCE[0]}" )" && pwd)
 
-if [ -d "$DEV/php" -a -x "$DEV/php/bin/php" ]; then
-       PHP="$DEV/php/bin/php"
-elif [ -d "$HOME/.mwphp" -a -x "$HOME/.mwphp/bin/php" ]; then
-       PHP="$HOME/.mwphp/bin/php"
-else
-       echo "Local copy of PHP is not installed"
-       echo 1
-fi
+. "$DEV/includes/require-php.sh"
 
 PORT=4881
 
@@ -18,4 +11,4 @@ echo "Starting up MediaWiki at http://localhost:$PORT/"
 echo ""
 
 cd "$DEV/../../"; # $IP
-"$PHP" -S "localhost:$PORT" "$DEV/router.php"
+"$PHP" -S "localhost:$PORT" "$DEV/includes/router.php"