Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-02-08 23:57:39 +01:00
Code Issues Packages Projects Releases Activity

Use global composer install when available

Browse Source
This commit is contained in:
Marcel Eschmann
2015-05-14 21:10:05 +02:00
parent 9382dc9c10
commit e0a4efe181
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
system/src/Grav/Console/ConsoleTrait.php
View File

@@ -85,7 +85,12 @@ trait ConsoleTrait
public function composerUpdate($path, $action = 'install')
{
return system('php bin/composer.phar --working-dir="'.$path.'" --no-interaction --no-dev --prefer-dist -o '. $action);
$composer = shell_exec("which composer");
if (!$composer || !preg_match('/(composer|composer\.phar)$/', $composer)) {
$composer = "bin/composer.phar";
}
return system('php '.$composer.' --working-dir="'.$path.'" --no-interaction --no-dev --prefer-dist -o '. $action);
}
/**