mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24561 from nextcloud/backport/24557/stable19 

[stable19] [stable20] dont use system composer for autoload checker
This commit is contained in:
Roeland Jago Douma 2020-12-07 11:55:49 +01:00 committed by GitHub
parent 6091ae9648 0f576303a3
commit 71e406627e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -155,3 +155,5 @@ clover.xml
# Tests - dependencies
tests/acceptance/composer.lock
tests/acceptance/vendor/
composer.phar

28
build/autoloaderchecker.sh
View File

@ -1,26 +1,18 @@
#!/usr/bin/env bash
COMPOSER_COMMAND=$(which "composer")
if [ "$COMPOSER_COMMAND" = '' ]
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"
COMPOSER_COMMAND="php composer.phar"
if [ -e "composer.phar" ]
then
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