From 1a8aaad0bcdfea5a0dfcaadd0a2daae176520e46 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 5 Jan 2017 11:01:59 +0100 Subject: [PATCH] Allow to use a global composer instance Signed-off-by: Joas Schilling --- build/autoloaderchecker.sh | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/build/autoloaderchecker.sh b/build/autoloaderchecker.sh index 0a1fb8ac351..b8ac493cb24 100644 --- a/build/autoloaderchecker.sh +++ b/build/autoloaderchecker.sh @@ -1,23 +1,33 @@ #!/usr/bin/env bash -#Make sure we are on the latest composer -if [ -e "composer.phar" ] +COMPOSER_COMMAND=$(which "composer") +if [ "$COMPOSER_COMMAND" = '' ] then - echo "Composer found: checking for update" - php composer.phar self-update + #No global composer found, try local or download it + if [ -e "composer.phar" ] + then + echo "Composer found: checking for update" + else + echo "Composer not found: fetching" + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" + php composer-setup.php + php -r "unlink('composer-setup.php');" + fi + + COMPOSER_COMMAND="php composer.phar" else - echo "Composer not found: fetching" - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - php composer-setup.php - php -r "unlink('composer-setup.php');" + echo "Global composer found: checking for update" fi +#Make sure we are on the latest composer +$COMPOSER_COMMAND self-update + REPODIR=`git rev-parse --show-toplevel` #Redump the autoloader echo echo "Regenerating autoloader" -php composer.phar dump-autoload -d $REPODIR +$COMPOSER_COMMAND dump-autoload -d $REPODIR files=`git diff --name-only` composerfile=false -- 2.39.5