public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #1045 from benji07/shebang-bug 

PEAR - Bug with shell shebang ?
pull/1060/merge
Jordi Boggiano 2012-09-04 06:33:26 -07:00
parent a04591bbd7 042d2d4a77
commit ecb6dcb60d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Installer/PearInstaller.php
View File

@ -55,6 +55,10 @@ class PearInstaller extends LibraryInstaller
$isWindows = defined('PHP_WINDOWS_VERSION_BUILD'); $isWindows = defined('PHP_WINDOWS_VERSION_BUILD');
$php_bin = $this->binDir . ($isWindows ? '/composer-php.bat' : '/composer-php'); $php_bin = $this->binDir . ($isWindows ? '/composer-php.bat' : '/composer-php');
if (!$isWindows) {
$php_bin = '/usr/bin/env ' . $php_bin;
}
$installPath = $this->getInstallPath($package); $installPath = $this->getInstallPath($package);
$vars = array( $vars = array(
'os' => $isWindows ? 'windows' : 'linux', 'os' => $isWindows ? 'windows' : 'linux',
@ -161,7 +165,7 @@ class PearInstaller extends LibraryInstaller
return return
"#!/usr/bin/env sh\n". "#!/usr/bin/env sh\n".
"SRC_DIR=`pwd`\n". "SRC_DIR=`pwd`\n".
"BIN_DIR=`dirname $(readlink -f $0)`\n". "BIN_DIR=`dirname $0`\n".
"VENDOR_DIR=\$BIN_DIR/".escapeshellarg($binToVendor)."\n". "VENDOR_DIR=\$BIN_DIR/".escapeshellarg($binToVendor)."\n".
"DIRS=\"\"\n". "DIRS=\"\"\n".
"for vendor in \$VENDOR_DIR/*; do\n". "for vendor in \$VENDOR_DIR/*; do\n".