Merge pull request #24557 from nextcloud/bugfix/noid/force-composerv1/stable20
[stable20] dont use system composer for autoload checker
This commit is contained in:
commit
d22fb14d92
|
@ -158,3 +158,5 @@ clover.xml
|
||||||
# Tests - dependencies
|
# Tests - dependencies
|
||||||
tests/acceptance/composer.lock
|
tests/acceptance/composer.lock
|
||||||
tests/acceptance/vendor/
|
tests/acceptance/vendor/
|
||||||
|
|
||||||
|
composer.phar
|
||||||
|
|
|
@ -1,26 +1,18 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
COMPOSER_COMMAND=$(which "composer")
|
COMPOSER_COMMAND="php composer.phar"
|
||||||
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"
|
if [ -e "composer.phar" ]
|
||||||
|
then
|
||||||
|
echo "Composer found: checking for update"
|
||||||
|
$COMPOSER_COMMAND self-update
|
||||||
else
|
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
|
fi
|
||||||
|
|
||||||
#Make sure we are on the latest composer
|
|
||||||
$COMPOSER_COMMAND self-update
|
|
||||||
|
|
||||||
REPODIR=`git rev-parse --show-toplevel`
|
REPODIR=`git rev-parse --show-toplevel`
|
||||||
|
|
||||||
|
@ -50,6 +42,8 @@ do
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
rm composer.phar
|
||||||
|
|
||||||
echo
|
echo
|
||||||
if [ $composerfile = true ]
|
if [ $composerfile = true ]
|
||||||
then
|
then
|
||||||
|
|
Loading…
Reference in New Issue