Merge pull request #7949 from johnstevenson/posix-proxy
Make unixy proxy code POSIX compatiblepull/7928/head
commit
6599f46c23
|
@ -196,9 +196,13 @@ class BinaryInstaller
|
||||||
|
|
||||||
dir=\$(cd "\${0%[/\\\\]*}" > /dev/null; cd $binDir && pwd)
|
dir=\$(cd "\${0%[/\\\\]*}" > /dev/null; cd $binDir && pwd)
|
||||||
|
|
||||||
if [ -d /proc/cygdrive ] && [[ \$(which php) == \$(readlink -n /proc/cygdrive)/* ]]; then
|
if [ -d /proc/cygdrive ]; then
|
||||||
# We are in Cgywin using Windows php, so the path must be translated
|
case \$(which php) in
|
||||||
|
\$(readlink -n /proc/cygdrive)/*)
|
||||||
|
# We are in Cygwin using Windows php, so the path must be translated
|
||||||
dir=\$(cygpath -m "\$dir");
|
dir=\$(cygpath -m "\$dir");
|
||||||
|
;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
"\${dir}/$binFile" "\$@"
|
"\${dir}/$binFile" "\$@"
|
||||||
|
|
Loading…
Reference in New Issue