Merge pull request #24561 from nextcloud/backport/24557/stable19
[stable19] [stable20] dont use system composer for autoload checker
This commit is contained in:
commit
71e406627e
|
@ -155,3 +155,5 @@ clover.xml
|
|||
# Tests - dependencies
|
||||
tests/acceptance/composer.lock
|
||||
tests/acceptance/vendor/
|
||||
|
||||
composer.phar
|
||||
|
|
|
@ -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
|
||||
$COMPOSER_COMMAND self-update
|
||||
else
|
||||
echo "Composer not found: fetching"
|
||||
php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
|
||||
php composer-setup.php
|
||||
php composer-setup.php --1
|
||||
php -r "unlink('composer-setup.php');"
|
||||
fi
|
||||
|
||||
COMPOSER_COMMAND="php composer.phar"
|
||||
else
|
||||
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`
|
||||
|
||||
|
@ -50,6 +42,8 @@ do
|
|||
fi
|
||||
done
|
||||
|
||||
rm composer.phar
|
||||
|
||||
echo
|
||||
if [ $composerfile = true ]
|
||||
then
|
||||
|
|
Loading…
Reference in New Issue