diff --git a/php/support/template-.launcher.php b/php/support/template-.launcher.php index eeb2b41..b1a3879 100644 --- a/php/support/template-.launcher.php +++ b/php/support/template-.launcher.php @@ -9,4 +9,4 @@ const NULIB_APP_app_params = [ "projdir" => __DIR__ . '/..', "appcode" => \app\config\bootstrap::APPCODE, ]; -require __DIR__.'/../vendor/nulib/php/php/src/app/cli/include-launcher.php'; +require __DIR__.'/../vendor/nulib/base/php/src/app/cli/include-launcher.php'; diff --git a/runphp/build b/runphp/build index 3f7c7b6..c8fe5dd 100755 --- a/runphp/build +++ b/runphp/build @@ -8,7 +8,7 @@ PROJDIR=; COMPOSERDIR=; COMPOSERPHAR=; VENDORDIR=; BUILDENV0=; BUILDENV= BUILD_IMAGES=(php-apache mariadb10); export BUILD_FLAVOUR=; DIST=; IMAGENAME= DISTFILES=(); TEMPLATEFILES=(); VARFILES=() source "$RUNPHP" || exit 1 -source "$PROJDIR/$VENDORDIR/nulib/php/load.sh" || exit 1 +source "$PROJDIR/$VENDORDIR/nulib/base/load.sh" || exit 1 require: template # recenser les valeur de proxy diff --git a/runphp/runphp b/runphp/runphp index e24aba5..07d0e8d 100755 --- a/runphp/runphp +++ b/runphp/runphp @@ -232,7 +232,7 @@ function host_check_projdir() { [ -n "$RUNPHP_STANDALONE" ] && return local install - if [ ! -f "$PROJDIR/$VENDORDIR/nulib/php/load.sh" ]; then + if [ ! -f "$PROJDIR/$VENDORDIR/nulib/base/load.sh" ]; then install=1 elif [ ! -f "$PROJDIR/.composer.lock.runphp" ]; then install=1 diff --git a/runphp/template.sh b/runphp/template.sh index 233c527..87fdd85 100755 --- a/runphp/template.sh +++ b/runphp/template.sh @@ -10,7 +10,7 @@ if [ -z "$_RUNPHP_IN_DOCKER" ]; then exec "$MYDIR/$RUNPHP" "$0" "$@" fi source "$MYDIR/$RUNPHP" || exit 1 -source "$PROJDIR/$VENDORDIR/nulib/php/load.sh" || exit 1 +source "$PROJDIR/$VENDORDIR/nulib/base/load.sh" || exit 1 args=( "description"