modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dkbuild: bug avec les chemins

This commit is contained in:
Jephté Clain 2023-05-23 15:11:54 +04:00
parent 5e876652f8
commit dc94b5c0cf
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dkbuild
View File

@ -2213,7 +2213,10 @@ fi
cd "$destdir" || die cd "$destdir" || die
[ -n "$action" ] || action=install [ -n "$action" ] || action=install
[ "$action" == none ] && return if [ "$action" == none ]; then
cd "$cwd"
return
fi
local build="${DEFAULTS[build_build]-1}" local build="${DEFAULTS[build_build]-1}"
local args local args
@ -2267,7 +2270,10 @@ fi
shift shift
done done
[ -n "$build" ] || return if [ -z "$build" ]; then
cd "$cwd"
return
fi
if [ "$php" != force -a "$php" != any ]; then if [ "$php" != force -a "$php" != any ]; then
# Si php n'est pas disponible dans le PATH, forcer l'utilisation de # Si php n'est pas disponible dans le PATH, forcer l'utilisation de
@ -2503,7 +2509,10 @@ cd "$projdir"
cd "$destdir" || die cd "$destdir" || die
[ -n "$action" ] || action=package [ -n "$action" ] || action=package
[ "$action" == none ] && return if [ "$action" == none ]; then
cd "$cwd"
return
fi
local build="${DEFAULTS[build_build]-1}" local build="${DEFAULTS[build_build]-1}"
local args="${DEFAULTS[mvn_args]}" local args="${DEFAULTS[mvn_args]}"
@ -2549,7 +2558,10 @@ cd "$projdir"
shift shift
done done
[ -n "$build" ] || return if [ -z "$build" ]; then
cd "$cwd"
return
fi
local version local version
case "$action" in case "$action" in