diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:12:12 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:12:12 -0400 |
| commit | c9aa36da061816dee256a979c2ff8d2ee41824d9 (patch) | |
| tree | 29f7002b80ee984b488bd047dbbd80b36bf892e9 /maintenance/dev/includes/php.sh | |
| parent | b4274e0e33eafb5e9ead9d949ebf031a9fb8363b (diff) | |
| parent | d1ba966140d7a60cd5ae4e8667ceb27c1a138592 (diff) | |
Merge branch 'archwiki'
# Conflicts:
# skins/ArchLinux.php
# skins/ArchLinux/archlogo.gif
Diffstat (limited to 'maintenance/dev/includes/php.sh')
| -rw-r--r-- | maintenance/dev/includes/php.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/maintenance/dev/includes/php.sh b/maintenance/dev/includes/php.sh index 7ce87944..3c5bef0d 100644 --- a/maintenance/dev/includes/php.sh +++ b/maintenance/dev/includes/php.sh @@ -4,7 +4,7 @@ # and previous home directory location # The binary path is returned in $PHP if any -for binary in $PHP `which php || true` "$DEV/php/bin/php" "$HOME/.mediawiki/php/bin/php" "$HOME/.mwphp/bin/php" ]; do +for binary in $PHP $(which php || true) "$DEV/php/bin/php" "$HOME/.mediawiki/php/bin/php" "$HOME/.mwphp/bin/php" ]; do if [ -x "$binary" ]; then if "$binary" -r 'exit((int)!version_compare(PHP_VERSION, "5.4", ">="));'; then PHP="$binary" |