diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-12-07 13:58:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 13:58:08 +0300 |
| commit | 6da1ac9a7ff351387b72e00a3d23313f41ebb9cd (patch) | |
| tree | 2fb420077371a632a6874f31c62dddbead7c1070 | |
| parent | 4ec5b3a82e0605faa22b72201a0aecb8e86d1dff (diff) | |
| parent | dc3ff2eeadd85f50d36068158120b3efb8d51570 (diff) | |
Merge pull request #24562 from nextcloud/backport/24557/stable18
[stable18] [stable20] dont use system composer for autoload checker
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | build/autoloaderchecker.sh | 28 |
2 files changed, 13 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore index 4e6967c19d1..93c45037771 100644 --- a/.gitignore +++ b/.gitignore @@ -153,3 +153,5 @@ clover.xml # Tests - dependencies tests/acceptance/composer.lock tests/acceptance/vendor/ + +composer.phar diff --git a/build/autoloaderchecker.sh b/build/autoloaderchecker.sh index ffa157f6c80..1aa880684f9 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 --1 + 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 |