Merge pull request #87 from kimrow/patch-1

Fix PHP "bad substitution" issue in older Bash versions

Author: pimterry

overrides/path/php

@@ -8,8 +8,9 @@ PATH="`dirname "$0"`:$PATH"
 
 # Strip out our PHP_INI_SCAN_DIR - if this file has been run succesfully, then it's not necessary,
 # and it can cause problems (since it overrides any default scan directories configured)
-export PHP_INI_SCAN_DIR="${PHP_INI_SCAN_DIR//:`echo $HTTP_TOOLKIT_OVERRIDE_PATH/php`/}"
-export PHP_INI_SCAN_DIR="${PHP_INI_SCAN_DIR//`echo $HTTP_TOOLKIT_OVERRIDE_PATH/php`/}"
+export INJECTED_PHP_INI_DIR=$HTTP_TOOLKIT_OVERRIDE_PATH/php
+export PHP_INI_SCAN_DIR="${PHP_INI_SCAN_DIR//:$INJECTED_PHP_INI_DIR/}"
+export PHP_INI_SCAN_DIR="${PHP_INI_SCAN_DIR//$INJECTED_PHP_INI_DIR/}"
 if [ -z "$PHP_INI_SCAN_DIR" ]; then
     unset PHP_INI_SCAN_DIR
 fi
@@ -30,4 +31,4 @@ if command -v winpty >/dev/null 2>&1; then
     winpty "$real_php" "${PHP_ARGS[@]}"
 else
     "$real_php" "${PHP_ARGS[@]}"
-fi
+fi