dkbuild: -u n'implique plus -b

This commit is contained in:
Jephté Clain 2023-08-13 17:09:29 +04:00
parent e5a147351d
commit f424f41561
1 changed files with 12 additions and 12 deletions

24
dkbuild
View File

@ -2812,7 +2812,7 @@ function build_action() {
action=build
[ -n "$update_src" ] || update_src=1
[ "$update_src" == no ] && update_src=
if [ -z "$sync_src" -a -z "$build" -a -z "$push_image" ]; then
if [ -z "$clean_update" -a -z "$sync_src" -a -z "$build" -a -z "$push_image" ]; then
sync_src=1
build=1
fi
@ -2828,6 +2828,17 @@ function build_action() {
setarg "${TMPARGS[@]}"
setarg "$@"
if [ -n "$clean_update" ]; then
edebug "clean"
_clean_git_clean -f || die
edebug "update"
git pull || die
edebug "sync"
[ -n "$build" ] && sync_src=1
fi
case "$action" in
clone_src)
die "Pas encore implémenté" #XXX
@ -2836,17 +2847,6 @@ function build_action() {
die "Pas encore implémenté" #XXX
;;
build)
if [ -n "$clean_update" ]; then
edebug "clean"
_clean_git_clean -f || die
edebug "update"
git pull || die
edebug "sync"
[ -n "$build" ] && sync_src=1
fi
default checkout checkout="$update_src"
default copy copy="$sync_src"
default build build="$build" ${no_cache:+no-cache} ${pull_image:+pull} ${push_image:+push}