diff options
Diffstat (limited to 'build')
| -rwxr-xr-x | build/autoloaderchecker.sh | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/build/autoloaderchecker.sh b/build/autoloaderchecker.sh index ffa157f6c80..9bf8b17a8c9 100755 --- a/build/autoloaderchecker.sh +++ b/build/autoloaderchecker.sh @@ -1,26 +1,18 @@ #!/usr/bin/env bash -COMPOSER_COMMAND=$(which "composer") -if [ "$COMPOSER_COMMAND" = '' ] +COMPOSER_COMMAND="php composer.phar" + +if [ -e "composer.phar" ] then - #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" + echo "Composer found: checking for update" + $COMPOSER_COMMAND self-update else - echo "Global composer found: checking for update" + 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 -#Make sure we are on the latest composer -$COMPOSER_COMMAND self-update REPODIR=`git rev-parse --show-toplevel` @@ -50,6 +42,8 @@ do fi done +rm composer.phar + echo if [ $composerfile = true ] then |