From ff1fe2c1035552eef61f1c7f6bccc9b7bc20d40e Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 19 Apr 2024 12:27:08 +0400 Subject: [PATCH] modifs.mineures sans commentaires --- support/rundk.2postamble | 2 +- support/template.sh | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/support/rundk.2postamble b/support/rundk.2postamble index fb138d5..bc89706 100644 --- a/support/rundk.2postamble +++ b/support/rundk.2postamble @@ -93,7 +93,7 @@ if [ -z "$bootstrap" ]; then fi if [ -n "$ForcedBootstrap" ]; then - [ -z "$_RUNDK_IN_DOCKER" ] && eecho "== bootstrap rundk is needed" + [ -z "$_RUNDK_IN_DOCKER" ] && eecho "== rundk is needed: bootstrapping" bootstrap=1 BootstrapOnly= fi diff --git a/support/template.sh b/support/template.sh index bf0f4d1..34771aa 100755 --- a/support/template.sh +++ b/support/template.sh @@ -2,13 +2,15 @@ # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 # Modèle de script utilisant rundk pour lancer un traitement dans un container # Ce script est à la racine du projet et rundk se trouve dans sbin/ +RUNDKDIR=sbin MYDIR="$(dirname -- "$0")"; MYNAME="$(basename -- "$0")" if [ -z "$_RUNDK_IN_DOCKER" ]; then - "$MYDIR/sbin/rundk" --bs --ue --ci || exit 1 - exec "$MYDIR/sbin/rundk" "$0" "$@" + "$MYDIR/$RUNDKDIR/rundk" --bs --ue --ci || exit 1 + exec "$MYDIR/$RUNDKDIR/rundk" "$0" "$@" fi -source "$MYDIR/vendor/nulib/php/load.sh" || exit 1 +source "$MYDIR/$RUNDKDIR/rundk" || exit 1 +source "$PROJDIR/$VENDORDIR/nulib/php/load.sh" || exit 1 args=( "description"