pvl-hosts: comparison bin/update

equal deleted inserted replaced

-:d99ebc15833d
+:baae373b787e
 ## options
 IS_TTY=
 LOG_WARN=y
 LOG=y
-LOG_INFO=
+LOG_INFO=y
+LOG_SKIP=
 LOG_DEBUG=
 LOG_CMD=
 UPDATE_FORCE=
 UPDATE_NOOP=
 q)
 LOG=
 LOG_WARN=
 ;;
-v)  LOG_INFO=y ;;
+v)  LOG_SKIP=y ;;
 D)
 LOG_DEBUG=y
 LOG_INFO=y
 ;;
 V)  LOG_CMD=y ;;
 function log_color {
 local code=$1; shift
 if [ $IS_TTY ]; then
-echo $'\e[0;'${code}'m'"$*"$'\e[00m' >&2
+echo $'\e['${code}'m'"$*"$'\e[00m' >&2
 else
 echo "$*" >&2
 fi
 }
 function log_error {
-log_color 31 "$*"
+log_color '31' "$*"
 }
 function log_warn {
-[ $LOG_WARN ] && log_color 33 "$*" || true
+[ $LOG_WARN ] && log_color '33' "$*" || true
 }
 function log {
 [ $LOG ] && log_msg "$*" || true
 }
 function log_info {
-[ $LOG_INFO ] && log_color 36 "  $*" || true
+[ $LOG_INFO ] && log_color '36' "  $*" || true
+}
+function log_skip {
+[ $LOG_SKIP ] && log_color '1;34' "  $*" || true
 }
 function log_debug {
 [ $LOG_DEBUG ] && log_color 32 "    $*" || true
 }
 log_cmd "$@"
 "$@" | sed "s/^/$indent/"
 return ${PIPESTATUS[0]}
+}
+function ensure_dir {
+local dir=$1
+if [ ! -d $ROOT/$dir ]; then
+log_warn "Creating output dir: $dir"
+cmd mkdir $ROOT/$dir
+fi
 }
 function abspath () {
 echo "$ROOT/$1"
 }
 for dep in "$@"; do
 # don't bother checking if already figured out
 [ $update ] && continue
 # check
+if [ ! -e $ROOT/$dep ]; then
-if [ $ROOT/$dst -ot $ROOT/$dep ]; then
+fail "$dst: Missing source: $dep"
+elif [ $ROOT/$dst -ot $ROOT/$dep ]; then
 log_debug "  changed: $dep"
 update=y
 fi
 done
 fi
 }
 function update {
 local dst=$1; shift;
+local msg=$1; shift
 local sep=
 local dep=()
 local cmd=()
 fi
 done
 [ ! $sep ] && fail "Invalid args given: $@"
-check_update $dst "${dep[@]}" && do_update $dst "${cmd[@]}" || true
+if check_update $dst "${dep[@]}"; then
+log_info "$msg..."
+do_update $dst "${cmd[@]}"
+else
+log_debug "$msg: not changed"
+fi
 }
 function check_link {
 local lnk=$1
 local tgt=$2
 # copy hosts input zone verbatim
 function copy_hosts {
 local zone=$1
 local base=$2
-log_debug "base: $base"
 if check_update $zone $base; then
 log_info "Copying hosts $zone <- $base..."
 do_update $zone \
 cat $ROOT/$base
 else
-log_info "Copying hosts $zone <- $base: not changed"
+log_skip "Copying hosts $zone <- $base: not changed"
 fi
 }
 # generate hosts zone from input zone
 function update_hosts {
 log_info "Generating hosts $zone <- $base..."
 do_update $zone \
 $BIN/process-zone $PROCESS_ARGS $ROOT/$base "$@"
 else
-log_info "Generating hosts $zone <- $base: not changed"
+log_skip "Generating hosts $zone <- $base: not changed"
 fi
 }
 ## actions
 # serial
 function update_serial {
 local zone=$1; shift
 local serial=$SERIALS/$zone.serial
+# read
 local old=$(test -e $ROOT/$serial && cat $ROOT/$serial || echo '')
 log_info "Updating $serial..."
-cmd $BIN/update-serial $* $ROOT/$serial
+cmd $BIN/update-serial $ROOT/$serial
+# read
 local new=$(cat $ROOT/$serial)
 log_debug "  $old -> $new"
 }
 log_info "Linking $lnk -> $tgt..."
 do_link $lnk $tgt
 else
-log_info "Linking $lnk -> $tgt: not changed"
+log_skip "Linking $lnk -> $tgt: not changed"
 fi
 }
 # zone
 function copy_zone {
 local src=$DATA/$base
 if check_update $out $src; then
 log_info "Copying $out <- $src..."
-do_update $out cat $ROOT/$src
+do_update $out \
-else
+cat $ROOT/$src
-log_info "Copying $out <- $src: not changed"
+else
+log_skip "Copying $out <- $src: not changed"
 fi
 }
 function update_zone {
 local view=$1
 local base=${3:-$zone}
 local out=$ZONES/$view/$zone
 local src=$DATA/$base.zone
 local lnk=$ZONES/$base
 local serial=$SERIALS/$base.serial
-log_debug "$out: from src $src"
+if check_update $out $src $serial; then
-if [ ! -e $src ]; then
-fail "Missing source: $src"
-elif check_update $out $src $serial; then
 log_info "Generating $out <- $src..."
 do_update $out \
 $BIN/expand-zone $ROOT/$src \
 --serial $ROOT/$serial              \
 --expand zones=$(abspath $ZONES)    \
 --expand view=$view
 else
-log_info "Generating $out <- $src: not changed"
+log_skip "Generating $out <- $src: not changed"
 fi
 }
 function link_zone {
 local view=$1
 local zone=$2
 local base=${3:-$zone}
 local out=$ZONES/$view/$zone
+# find tgt
 for tgt in $ZONES/$view/$base $ZONES/common/$base; do
 [ $tgt != $out ] && [ -e $tgt ] && break
 done
-log_debug "$out: from "
 if check_link $out $tgt; then
 log_info "Linking $out -> $tgt..."
 do_link $out $tgt
 else
-log_info "Linking $out -> $tgt: not changed"
+log_skip "Linking $out -> $tgt: not changed"
 fi
 }
 ## Tests
 function check_hosts {
 local hosts=$1; shift 1
 local cmd=($BIN/process-zone $PROCESS_ARGS $ROOT/$hosts --check-hosts "$@")
 if "${cmd[@]}" -q; then
-log_info "Check $hosts: OK"
+log_skip "Check $hosts: OK"
 else
 log_error "  Check $hosts: Failed"
 indent "    " "${cmd[@]}"
 local cmd=($NAMED_CHECKZONE $origin $ROOT/$src)
 # test
 # XXX: checkzone is very specific about the order of arguments, -q must be first
 if $NAMED_CHECKZONE -q $origin $ROOT/$src; then
-log_info "Check $src ($origin): OK"
+log_skip "Check $src ($origin): OK"
 else
 log_error "  Check $src ($origin): Failed:"
 indent "    " "${cmd[@]}"
 indent "    " hg_diff
 hg_commit "$COMMIT_MSG"
 else
 log_info "Commit changes in $repo: no changes"
-fi
-}
-function ensure_dir {
-local dir=$1
-if [ ! -d $ROOT/$dir ]; then
-log_warn "Creating output dir: $dir"
-cmd mkdir $ROOT/$dir
 fi
 }
 function main {
 # test tty

changeset 564	baae373b787e
parent 563	d99ebc15833d
child 565	ef5bcc4145de