From e0a4efe18197e952d15636ada2b1ca01fcd3d259 Mon Sep 17 00:00:00 2001 From: Marcel Eschmann Date: Thu, 14 May 2015 21:10:05 +0200 Subject: [PATCH] Use global composer install when available --- system/src/Grav/Console/ConsoleTrait.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/system/src/Grav/Console/ConsoleTrait.php b/system/src/Grav/Console/ConsoleTrait.php index a2e80b6e8..e848b2260 100644 --- a/system/src/Grav/Console/ConsoleTrait.php +++ b/system/src/Grav/Console/ConsoleTrait.php @@ -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); } /**