dkbuild: indiquer si la version de Java demandée n'est pas trouvée
This commit is contained in:
parent
2803868e16
commit
744a3fa0ac
8
dkbuild
8
dkbuild
|
@ -1834,7 +1834,7 @@ function define_functions_cmd() {
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
[ -n "${DEFAULTS[build_build]-1}" ] || return
|
[ -n "${DEFAULTS[build_build]-1}" ] || return 0
|
||||||
[ -n "$output" ] || die "genfile: Vous devez spécifier le fichier en sortie"
|
[ -n "$output" ] || die "genfile: Vous devez spécifier le fichier en sortie"
|
||||||
if [ -n "$context" ]; then
|
if [ -n "$context" ]; then
|
||||||
mkdir -p "$context" || die
|
mkdir -p "$context" || die
|
||||||
|
@ -1870,7 +1870,7 @@ function define_functions_cmd() {
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
[ -n "${DEFAULTS[build_build]-1}" ] || return
|
[ -n "${DEFAULTS[build_build]-1}" ] || return 0
|
||||||
[ -n "$DOCKERFILE" ] || DOCKERFILE=Dockerfile
|
[ -n "$DOCKERFILE" ] || DOCKERFILE=Dockerfile
|
||||||
DOCKERCONTEXT=.
|
DOCKERCONTEXT=.
|
||||||
if [ -n "$context" ]; then
|
if [ -n "$context" ]; then
|
||||||
|
@ -1894,7 +1894,7 @@ function define_functions_cmd() {
|
||||||
function add2dockerfile() {
|
function add2dockerfile() {
|
||||||
edebug "$(qvals "$@")"
|
edebug "$(qvals "$@")"
|
||||||
|
|
||||||
[ -n "${DEFAULTS[build_build]-1}" ] || return
|
[ -n "${DEFAULTS[build_build]-1}" ] || return 0
|
||||||
[ -n "$DOCKERFILE" ] || return
|
[ -n "$DOCKERFILE" ] || return
|
||||||
echo "$*" >>"$DOCKERFILE"
|
echo "$*" >>"$DOCKERFILE"
|
||||||
}
|
}
|
||||||
|
@ -2380,7 +2380,7 @@ exit((PHP_VERSION_ID < $version)? 0: 1);
|
||||||
function _local_mvn() {
|
function _local_mvn() {
|
||||||
if [ -n "$java" ]; then
|
if [ -n "$java" ]; then
|
||||||
urequire java
|
urequire java
|
||||||
select_java_exact "$java" || die
|
select_java_exact "$java" || die "mvn: Java $java introuvable"
|
||||||
export MVN_JAVA_VERSION="$java"
|
export MVN_JAVA_VERSION="$java"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue