Make use of debug*() routines

src/include/build.sh

@@ -24,6 +24,7 @@ build1() {
     local ftype="$3"
     test -n "$dstpath"  || dstpath=${srcpath%.skel}
     test -n "$ftype"    || ftype=$(guess_ftype "$dstpath")
+    debug_var srcpath dstpath ftype
     <"$srcpath" build1_ftype "$ftype" >"$dstpath"
     mkdir -p "$MKIT_LOCAL"
     echo "$dstpath" >> "$MKIT_LOCAL/built.lst"
@@ -146,11 +147,13 @@ expand_variables() {
     local section varname varvalue
     for section in "$@";
     do
+        debug_var section
         ini lskeys "$section" \
           | while read varname;
             do
                 varvalue="$(ini 1value "$section:$varname" | sed -e 's/\$/\\$/' )"
                 echo "s|$varname|$varvalue|;" >> "$script"
+                debug_var varname varvalue
             done
     done
     echo "s|__CODENAME__|$CODENAME|;"     >> "$script"

src/include/deploy.sh

@@ -4,8 +4,9 @@ _maybe() {
     #
     # Call the deploy command $1 $@ unless in dry mode
     #
+    debug "$@"
     local cmd="$1"; shift
-    $MKIT_DRY && echo "MKIT_DRY: $cmd" "$@" && return
+    $MKIT_DRY && return
     case "$cmd" in
         cp|rm|rmdir|chmod|mkdir) $cmd "$@" ;;
         install)                 command -p install "$@" ;;