Compare commits
21 Commits
Author | SHA1 | Date |
---|---|---|
Jephté Clain | 0527aee96e | |
Jephté Clain | f39787c6ec | |
Jephté Clain | 9d8e3c53d1 | |
Jephté Clain | 1b7b2744ba | |
Jephté Clain | 771bd1c563 | |
Jephté Clain | 6e36d26471 | |
Jephté Clain | e5ab8dd240 | |
Jephté Clain | c0d4e950e9 | |
Jephté Clain | e76a6a6a84 | |
Jephté Clain | b03df72236 | |
Jephté Clain | 44f719b2e6 | |
Jephté Clain | 337f24c447 | |
Jephté Clain | 246b9473aa | |
Jephté Clain | 9d5713c1f9 | |
Jephté Clain | 05fd86acc7 | |
Jephté Clain | abd178bf0d | |
Jephté Clain | 2283a66201 | |
Jephté Clain | 7f143c0fd4 | |
Jephté Clain | 046ba0d323 | |
Jephté Clain | c8b8f107a1 | |
Jephté Clain | 1210ca7382 |
26
dk
26
dk
|
@ -2099,10 +2099,8 @@ function auto_composer() {
|
|||
esac
|
||||
done
|
||||
|
||||
local use_runphp use_image
|
||||
if [ "$COMPOSER_PHP" == runphp ]; then
|
||||
use_runphp=1
|
||||
elif [ "$COMPOSER_PHP" == force -o "$COMPOSER_PHP" == any ]; then
|
||||
local use_image
|
||||
if [ "$COMPOSER_PHP" == force -o "$COMPOSER_PHP" == any ]; then
|
||||
use_image=1
|
||||
elif [ "$COMPOSER_PHP" == none -o "$COMPOSER_PHP" == system ]; then
|
||||
COMPOSER_PHP=none
|
||||
|
@ -2123,7 +2121,7 @@ exit((PHP_VERSION_ID > $version)? 0: 1);
|
|||
*) ewarn "Erreur lors du lancement de PHP: est-il installé? Vous pouvez utiliser COMPOSER_PHP=any";;
|
||||
esac
|
||||
fi
|
||||
if [ -n "$use_runphp" -o -n "$use_image" -o "$COMPOSER_PHP" == none ]; then
|
||||
if [ -n "$use_image" -o "$COMPOSER_PHP" == none ]; then
|
||||
: # ok, on a déjà décidé
|
||||
elif [ -z "$COMPOSER_PHP" ]; then
|
||||
# pas de version minimum, tester simplement la valeur de COMPOSER_IMAGE
|
||||
|
@ -2145,23 +2143,7 @@ exit((PHP_VERSION_ID < $version)? 0: 1);
|
|||
esac
|
||||
fi
|
||||
|
||||
if [ -n "$use_runphp" ]; then
|
||||
(
|
||||
export PROJDIR="$(pwd)"
|
||||
export RUNPHP_STANDALONE=
|
||||
RUNPHP=; DIST=; REGISTRY=
|
||||
if [ -f "$PROJDIR/.runphp.conf" ]; then
|
||||
source "$PROJDIR/.runphp.conf"
|
||||
[ -n "$RUNPHP" ] && exec "$PROJDIR/$RUNPHP" composer "$@"
|
||||
elif [ -f "$PROJDIR/sbin/runphp" ]; then
|
||||
exec "$PROJDIR/sbin/runphp" composer "$@"
|
||||
elif [ -f "$PROJDIR/runphp" ]; then
|
||||
exec "$PROJDIR/runphp" composer "$@"
|
||||
fi
|
||||
exec runphp composer "$@"
|
||||
)
|
||||
|
||||
elif [ -n "$use_image" ]; then
|
||||
if [ -n "$use_image" ]; then
|
||||
[ "$COMPOSER_IMAGE" != none ] || die "Vous devez spécifier l'image à utiliser pour composer"
|
||||
|
||||
local PREVIOUS_DOCKER_MACHINE_NAME="$DOCKER_MACHINE_NAME"
|
||||
|
|
Loading…
Reference in New Issue