Update MKit to v0.0.34

mkit.ini

@@ -27,7 +27,7 @@
     share   = [ENV:PREFIX]/share/imapdomo
     etc     = /etc/imapdomo
 
-[tokens]
+[macros]
     __IMAPDOMO_CONFIG_USER__    = $HOME/.config/imapdomo
     __IMAPDOMO_CONFIG_LOCAL__   = [roots:etc]
     __IMAPDOMO_SHARE__          = [roots:share]
@@ -41,4 +41,4 @@
     share   = src/main.lua
     share   = src/common.lua
 
-#mkit version=0.0.24
+#mkit version=0.0.34

utils/mkit/include/build.sh

@@ -6,7 +6,7 @@ mkit_import ini
 mkit_import facts
 
 
-_build1() {
+__build1() {
     #
     # Process one skeleton $1 of type $3 (or guessed) to path $2
     #
@@ -14,97 +14,95 @@ _build1() {
     local dstpath=$2    # destination meaty animal path
     local ftype=$3      # file/builder type
     test -n "$dstpath"  || dstpath=${srcpath%.skel}
-    test -n "$ftype"    || ftype=$(_guess_ftype "$dstpath")
+    test -n "$ftype"    || ftype=$(__guess_ftype "$dstpath")
     debug_var srcpath dstpath ftype
-    <"$srcpath" _build1_ftype "$ftype" >"$dstpath"
-    rec_built "$dstpath"
+    <"$srcpath" __build1_ftype "$ftype" >"$dstpath"
+    __rec_built "$dstpath"
 }
 
-_build1_ftype() {
+__build1_ftype() {
     #
     # Build a file of type $1; fom stdin to stdout
     #
     local ftype=$1      # file/builder type
     case $ftype in
-        MKIT_COMMON)    _expand_tokens "tokens" ;;
-        markdown)       _expand_includes | _expand_tokens "tokens" ;;
-        rpmstuff)       _expand_tokens "tokens" "rpmstuff:tokens" ;;
-        debstuff)       _expand_tokens "tokens" "debstuff:tokens" ;;
+        MKIT_COMMON)    __expand_macros "macros" ;;
+        rpmstuff)       __expand_macros "macros" "rpmstuff:macros" ;;
+        debstuff)       __expand_macros "macros" "debstuff:macros" ;;
         *)              die "unknown file type: $ftype" ;;
     esac
 }
 
-_expand_includes() {
-    #
-    # Expand include directives
-    #
-    # Expand e.g. `<!-- include4: foo.sh -->` to include code of foo.sh
-    #
-    perl -we '
-        use strict;
-        my $text;
-        while (<>) {
-            chomp;
-            if (m/<!-- include4: (\S+) -->/) {
-                open my $fh, $1 or warn "cannot find: $1";
-                my $text = do { local($/); <$fh> };
-                close $fh;
-                $text =~ s/^(.)/    $1/gm;
-                chomp $text;
-                print "$text\n";
-            } else {
-                print "$_\n";
-            }
-        }
-    '
+__expand_line() {
+    #
+    # Expand macro from $MacroMap in single line $1
+    #
+    # If macro value has multiple lines, repeat original line with
+    # different substitution.
+    #
+    # E.g. if macro value is "foo\nbar" and macro name is __FOO__,
+    # line `see: "__FOO__"` will expand to two lines: `see: "foo"`
+    # and `see: "bar"`.
+    #
+    local line=$1   # line to process
+    local mname     # macro name
+    local mvline    # line of macro value
+    local xline     # expanded line
+    xline=$line
+    for mname in "${!MacroMap[@]}"; do
+        if ! test "${line//$mname}" == "$line"; then
+            xline=$(
+                while IFS= read -r mvline; do
+                    echo "${line//$mname/$mvline}"
+                done <<<"${MacroMap[$mname]}"
+            )
+        fi
+        line=$xline
+    done
+    echo "$xline"
+    return 1
 }
 
-_expand_tokens() {
+__expand_macros() {
     #
-    # Read stdin, expanding tokens from sections $@
+    # Read stdin, expanding macros from sections $@
     #
-    local script        # sed script cache
-    local section       # each section to expand tokens from
-    local varname       # each token name
-    local varvalue      # each token value
-    script=$(mktemp --tmpdir mkit-tmp.XXXXXXXXXX)
-    {
-        for section in "$@"; do
-            debug_var section
-            ini lskeys "$section" \
-              | while read -r varname; do
-                    varvalue="$(ini 1value "$section:$varname" | _qfs )"
-                    echo "s|$varname|$varvalue|g;"
-                    debug_var varname varvalue
-                done
+    local section       # each section to expand macros from
+    local line          # each line on stdin
+    local mname         # each macro name
+    local -A MacroMap   # macro value map
+    MacroMap[__MKIT_PROJ_NAME__]=$(ini 1value project:name)
+    MacroMap[__MKIT_PROJ_CODENAME__]=$(ini 1value project:codename)
+    MacroMap[__MKIT_PROJ_LICENSE__]=$(ini 1value project:license)
+    MacroMap[__MKIT_PROJ_PKGNAME__]=$(ini 1value project:pkgname)
+    MacroMap[__MKIT_PROJ_TAGLINE__]=$(ini 1value project:tagline)
+    MacroMap[__MKIT_PROJ_MAINTAINER__]=$(ini 1value project:maintainer)
+    MacroMap[__MKIT_PROJ_VCS_BROWSER__]=$(ini 1value project:vcs_browser)
+    MacroMap[__MKIT_PROJ_GIT_LASTHASH__]=$(__cached git_lasthash)
+    MacroMap[__MKIT_PROJ_VERSION__]=$(__cached semver)
+    MacroMap[__MKIT_SELF_VERSION__]=$MKIT_VERSION
+    for section in "$@"; do
+        for mname in $(ini lskeys "$section"); do
+            MacroMap[$mname]=$(ini values "$section:$mname")
         done
-        echo "s|__MKIT_PROJ_NAME__|$(ini 1value project:name | _qfs)|g;"
-        echo "s|__MKIT_PROJ_CODENAME__|$(ini 1value project:codename | _qfs)|g;"
-        echo "s|__MKIT_PROJ_LICENSE__|$(ini 1value project:license | _qfs)|g;"
-        echo "s|__MKIT_PROJ_PKGNAME__|$(ini 1value project:pkgname | _qfs)|g;"
-        echo "s|__MKIT_PROJ_TAGLINE__|$(ini 1value project:tagline | _qfs)|g;"
-        echo "s|__MKIT_PROJ_MAINTAINER__|$(ini 1value project:maintainer | _qfs)|g;"
-        echo "s|__MKIT_PROJ_VCS_BROWSER__|$(ini 1value project:vcs_browser | _qfs)|g;"
-        echo "s|__MKIT_PROJ_GIT_LASTHASH__|$(git_lasthash | _qfs)|g;"
-        echo "s|__MKIT_PROJ_VERSION__|$(semver | _qfs)|g;"
-        echo "s|__MKIT_SELF_VERSION__|$MKIT_VERSION|g;"
-    } >> "$script"
-    sed -f "$script" || die "_expand_tokens failed"
-    rm "$script"
-}
-
-_guess_ftype() {
+    done
+    debug_var MacroMap
+    while IFS= read -r line; do
+        __expand_line "$line"
+    done
+}
+
+__guess_ftype() {
     #
     # Guess file type from destination path $1
     #
     local dstpath=$1    # destination path
     case $dstpath in
-        *.md) echo markdown    ;;
         *)    echo MKIT_COMMON ;;
     esac
 }
 
-_qfs() {
+__qfs() {
     #
     # Quote for our sed scipt's RHS
     #
@@ -114,37 +112,102 @@ _qfs() {
     '
 }
 
+__cached() {
+    #
+    # Cached value $1 of function $1()
+    #
+    # In order to support git-less builds, some values might be cached
+    # in $MKIT_LOCAL.  This function gets file $1 from that cache (cache
+    # hit) or re-creates it (cache miss), but prints its body in either
+    # case.
+    #
+    # The command to re-create file is the same as the key (ie. no
+    # arguments).
+    #
+    local name=$1
+    __local_get "$name" && return 0
+    "$name" | __local_putb "$name"
+    __local_get "$name"
+}
+
+__local_putb() {
+    #
+    # Make file $1 in $MKIT_LOCAL from stdin and mark as built
+    #
+    local fpath=$1
+    __local_put "$fpath" && __rec_built "$MKIT_LOCAL/$fpath"
+}
+
+__local_put() {
+    #
+    # Make file $1 in $MKIT_LOCAL from stdin
+    #
+    local fpath="$MKIT_LOCAL/$1"
+    { mkdir -p "${fpath%/*}" && cat >"$fpath"; } \
+     || die "cannot write to local cache: $fpath"
+}
+
+__local_get() {
+    #
+    # Read file $1 in $MKIT_LOCAL
+    #
+    local fpath="$MKIT_LOCAL/$1"
+    cat "$fpath" 2>/dev/null
+}
+
+__rec_built() {
+    #
+    # Record file $1 for deletion on `clean`
+    #
+    local file=$1
+    mkdir -p "$MKIT_LOCAL"
+    echo "$file" >> "$MKIT_LOCAL/built.lst"
+}
+
+_mkit_data() {
+    #
+    # Build sampler showing all macro values
+    #
+    local macro
+    local section
+    local sections
+    sections=()
+    ini lskeys macros | grep -q . && sections=(macros)
+    sections+=( $(ini lssect | grep ':macros$') )
+    {
+        echo "(builtin):"
+        echo "  x_MKIT_PROJ_NAME__ => '__MKIT_PROJ_NAME__'"
+        echo "  x_MKIT_PROJ_CODENAME__ => '__MKIT_PROJ_CODENAME__'"
+        echo "  x_MKIT_PROJ_LICENSE__ => '__MKIT_PROJ_LICENSE__'"
+        echo "  x_MKIT_PROJ_PKGNAME__ => '__MKIT_PROJ_PKGNAME__'"
+        echo "  x_MKIT_PROJ_TAGLINE__ => '__MKIT_PROJ_TAGLINE__'"
+        echo "  x_MKIT_PROJ_MAINTAINER__ => '__MKIT_PROJ_MAINTAINER__'"
+        echo "  x_MKIT_PROJ_VCS_BROWSER__ => '__MKIT_PROJ_VCS_BROWSER__'"
+        echo "  x_MKIT_PROJ_GIT_LASTHASH__ => '__MKIT_PROJ_GIT_LASTHASH__'"
+        echo "  x_MKIT_PROJ_VERSION__ => '__MKIT_PROJ_VERSION__'"
+        echo "  x_MKIT_SELF_VERSION__ => '__MKIT_SELF_VERSION__'"
+        for section in "${sections[@]}"; do
+            echo "$section:"
+            for macro in $(ini lskeys "$section"); do
+                echo "  x${macro:1} => '$macro'"
+            done
+        done
+    } \
+      | __expand_macros "MKIT_BUILTIN" "${sections[@]}" \
+      | sed '/^  x/ s|x|_|'
+}
+
 build() {
     #
     # Add meat to all skeletons
     #
     local srcpath   # each source path
-    semver >/dev/null
     find . -type f -name '*.skel' \
      | while read -r srcpath; do
-           _build1 "$srcpath"
+           __build1 "$srcpath"
        done
 }
 
-build_manpages() {
-    #
-    # Build manpages using ronn
-    #
-    local manfile   # each manual file listed in '[files:man]'
-    local mdfile    # each source markdown file
-    if command -v ronn >/dev/null; then
-        ini lskeys "files:man" \
-          | while read -r manfile; do
-                mdfile="$manfile.md"
-                ronn -r "$mdfile"
-                rec_built "$manfile"
-            done
-    else
-        echo "ronn is not installed"
-        return 1
-    fi
-}
-
 clean() {
     #
     # Clean up tree after building
@@ -166,14 +229,14 @@ debstuff() {
     local debian_skel   # 'debian' folder skeleton
     local dfsrc         # each source file from ^^
     local dftgt         # each built packaging file
-    version=$(semver)
+    version=$(__cached semver)
 
     # tarball - we should already have by means of 'dist'
     #
     mv "${MKIT_PROJ_PKGNAME}-$version.tar.gz" \
        "${MKIT_PROJ_PKGNAME}_$version.orig.tar.gz" \
      || die "could not rename tarball"
-    rec_built "${MKIT_PROJ_PKGNAME}_$version.orig.tar.gz"
+    __rec_built "${MKIT_PROJ_PKGNAME}_$version.orig.tar.gz"
 
     # read content of each mandatory file from debian_skel
     #
@@ -185,16 +248,16 @@ debstuff() {
       | while read -r dfsrc; do
             dftgt="debian/${dfsrc#$debian_skel}"
             mkdir -p "$(dirname "$dftgt")"
-            _build1 "$dfsrc" "$dftgt" debstuff
+            __build1 "$dfsrc" "$dftgt" debstuff
         done
-    rec_built debian
+    __rec_built debian
 }
 
 dist() {
     #
     # Create distributable tarball
     #
-    #FIXME: lacking Makefile skills, we do this step twice fot
+    #FIXME: lacking Makefile skills, we do this step twice for
     #       rpmstuff, hence -f hack for gzip
     #
     local version           # tarball version
@@ -205,12 +268,12 @@ dist() {
     git_lasthash=$(git_lasthash)
     mkdir -p "$dirname"
     ini values "dist:tarball" | xargs -I DIST_ITEM cp -R DIST_ITEM "$dirname"
-    update_version "$version" "$dirname/mkit.ini"
     mkdir -p "$dirname/.mkit"
+    echo -n "$version" > "$dirname/.mkit/semver"
     echo -n "$git_lasthash" > "$dirname/.mkit/git_lasthash"
     tar -cf "$dirname.tar" "$dirname"
     gzip -f "$dirname.tar"      # see above FIXME
-    rec_built "$dirname.tar.gz"
+    __rec_built "$dirname.tar.gz"
     rm -rf "$dirname"
 }
 
@@ -223,5 +286,5 @@ rpmstuff() {
     specsrc="$(ini 1value "dist:rpmstuff")"
     test -n "$specsrc" || die "dist:rpmstuff not specified"
     test -f "$specsrc" || die "specfile template not found: $specsrc"
-    _build1 "$specsrc" "$specname" rpmstuff
+    __build1 "$specsrc" "$specname" rpmstuff
 }

utils/mkit/include/deploy.sh

@@ -4,11 +4,11 @@
 
 mkit_import ini
 
-_deploy_item() {
+__deploy_item() {
     #
     # Deploy item and make it look like wanted
     #
-    # usage: _deploy_item src dst [mode]
+    # usage: __deploy_item src dst [mode]
     #
     # Both src and dst must be names of actual items[1],
     # whereas dst must not exist.  On update, dst is
@@ -37,14 +37,15 @@ _deploy_item() {
                 [[ $item =~ .skel$ ]] \
                  && grep -q "${item%.skel}" "$MKIT_LOCAL/built.lst" \
                  && continue
-                _deploy_item "$item" "$dst${item#$src}" "$mode"
+                __deploy_item "$item" "$dst${item#$src}" "$mode"
             done
     else
-        _maybe install -DTvm "$mode" "$src" "$dst"
+        test "$mode" == "SRC" && mode=$(stat -c "%a" "$src")
+        __maybe install -DTvm "$mode" "$src" "$dst"
     fi
 }
 
-_get_dst() {
+__get_dst() {
     #
     # Find out target path for src file $2 of group $1
     #
@@ -52,10 +53,10 @@ _get_dst() {
     local src=$2        # each source
     local dst=$3        # alternative destination name
     test -n "$dst" || dst=${src##*/}
-    echo "$(_get_root "$grp")/$dst"
+    echo "$(__get_root "$grp")/$dst"
 }
 
-_get_root() {
+__get_root() {
     #
     # Find out target root for group $1
     #
@@ -72,7 +73,7 @@ _get_root() {
     esac
 }
 
-_maybe() {
+__maybe() {
     #
     # Call the deploy command $1 $@ unless in dry mode
     #
@@ -101,8 +102,8 @@ install() {
             mode=$(ini 1value "modes:$group")
             ini values "files:$group" \
               | while read -r src dst; do
-                    dst=$(_get_dst "$group" "$src" "$dst")
-                    _deploy_item "$src" "$dst" "$mode"
+                    dst=$(__get_dst "$group" "$src" "$dst")
+                    __deploy_item "$src" "$dst" "$mode"
                 done
         done
     test -f "$MKIT_LOCAL/autoclean" && clean
@@ -122,8 +123,8 @@ uninstall() {
       | while read -r group; do
             ini values "files:$group" \
               | while read -r src dst; do
-                    dst=$(_get_dst "$group" "$src" "$dst")
-                    _maybe rm -vrf "$dst"
+                    dst=$(__get_dst "$group" "$src" "$dst")
+                    __maybe rm -vrf "$dst"
                 done
         done
 }

utils/mkit/include/facts.sh

@@ -54,6 +54,9 @@ git_fact() {
         latest_sha)
             git log -1 --pretty=format:%h HEAD
             ;;
+        latest_cdate)
+            git log -1 --format=%cd --date=unix HEAD
+            ;;
         *)
             warn "unknown git fact asked: $fact_name"
             ;;
@@ -85,100 +88,100 @@ git_lasthash() {
     #
     # Show last commit hash (with .dirty suffix if needed)
     #
-    # If outside git repo, get it from .mkit/git_lasthash, which
-    # should have been put there by dist target.  (I.e., this won't
-    # work if you got outside the git repo in other way than dist
-    # target, but that's actually expected.)
+    # We can't do it outside git repo (or without git) but we should
+    # not be asked to; targets that don't require git should make use
+    # of cache built by dist target.
     #
     local last_hash     # last commit hash
-    if git_present; then    # we are in git repo
-        last_hash=$(git rev-parse HEAD)
-        echo -n "$last_hash"
-        git_bool dirty && echo -n ".dirty"
-    else    # we are outside (eg. distributor's build dir')
-        grep . .mkit/git_lasthash || {
-            echo UNKNOWN
-            warn "malformed source, could not determine git hash"
-        }
-    fi
+    git_present || {
+        echo UNKNOWN_HASH
+        warn "no git present; could not determine last hash"
+        return 3
+    }
+    last_hash=$(git rev-parse HEAD)
+    echo -n "$last_hash"
+    git_bool dirty && echo -n ".dirty"
 }
 
 semver() {
     #
-    # Build semver version string with build metadata
+    # Build proper SemVer version string
     #
     # Build version string from available info using following
     # logic:
     #
-    #  1. use project.version (from mkit.ini)
-    #  2. if we are in git, override the version with last tag
-    #  3. if set, add project:prerl (from mkit.ini) as pre-release ID
+    #  1. Use version from last git tag (or mkit.ini if there is no
+    #     tag, which is possible on new project)
+    #  2. if set, add project:prerl (from mkit.ini) as pre-release ID
     #     (afer dash)
-    #  4. if we are at a later commit than the last tag, add branch
+    #  3. if we are at a later commit than the last tag, add branch
     #     name and commit sha1 to build metadata (after plus sign)
-    #  5. if the tree is "dirty", i.e. has uncommited changes,
+    #  4. if the tree is "dirty", i.e. has uncommited changes,
     #     add "dirty" to build metadata
     #
     # The version is compatible with SemVer 2.0.0.
     #
     # Examples:
     #
-    #     myprog v1.0.7                         # all clear
-    #     myprog v1.0.7-alpha                   # mkit.ini: project:prerl="alpha"
-    #     myprog v1.0.7-alpha+g1aef811.master   # ^^ + some commits after
-    #     myprog v1.0.7-alpha+gf14fc4f.api2     # ^^ + on a feature branch
-    #     myprog v1.0.7-alpha+gf14fc4f.api2.dirty  # ^^ + tree edited
-    #     myprog v1.0.7-alpha+dirty             # tag OK but tree edited
-    #     myprog v1.0.7+dirty                   # ^^ but no pre-release id
+    #     foo v1.0.7                            # all clear; proper release
+    #     foo v1.0.7-beta                       # mkit.ini: project:prerl="beta"
+    #     foo v1.0.7-beta+g1aef811.master       # ^^ + some commits after
+    #     foo v1.0.7-beta+gf14fc4f.api2         # ^^ + on a feature branch
+    #     foo v1.0.7-beta+gf14fc4f.api2.dirty   # ^^ + tree edited
+    #     foo v1.0.7-beta+dirty                 # tag OK but tree edited
+    #     foo v1.0.7+dirty                      # ^^ but no pre-release id
     #
     # Note that versions with "dirty" should be perceived as kind of
     # dangerous outside developer's own machine.  Versions with sha1 are
     # safer but must not be released.
     #
-    # I have considered decorating the git commit refs to make them
-    # sort of sortable (e.g. "r1.g1aef811"), but on second thought,
-    # I don't think it's good idea to give *any* semantics to meta-data
-    # at all.  First, there is no rule that r1<r2<r3; a commit can be
-    # removing what other just added and one change can be split to
-    # multiple commits.  Also, the whole thing breaks anyway once you
-    # rebase your branch (no, it's not a sin).  The sole purpose of
-    # meta-data is to *identify* the code, and provide safe path back
-    # to tree; commit refs are already perfect for that.
-    #
     # FIXME:  Using project:prerl for release IDs may not be compatible with
     #         release strategy implemented in release.sh
     #
-    local version       # version string (final result)
-    local prerl         # pre-release keyword (from mkit.ini, eg. 'alpha')
+    local xyz           # base version string
+    local prerl         # pre-release keyword (from mkit.ini, eg. 'beta')
     local latest_tag    # latest git tag
     local commit        # commit indicator (CURRENT_BRANCH.gHASH)
-    local dirty         # 0 if dirty, 1 if clean
+    local dirty=F       # F if dirty, T if clean
+    local btime         # timestamp or nothing (see $MKIT_TTAG)
     local suffix        # version suffix
-    local_get semver && return 0
-    version=$(ini 1value project:version)
     prerl=$(ini 1value project:prerl)
+    case $MKIT_TTAG in
+        none)   btime= ;;
+        btime)  btime=$(date -u +%Y%m%d%H%M%S) ;;
+        ctime)  btime=$(date -d @"$(git_fact latest_cdate)" -u +%Y%m%d%H%M%S) ;;
+    esac
     grep ":" <<<"$prerl" \
      && warn "colon in project:prerl may corrupt version data: $prerl"
-    if git_present;
-    then    # we are in git repo... so we can get smart
-        latest_tag=$(git_fact latest_tag)
-        if ! git describe --tags --exact-match HEAD >&/dev/null;
-        then    # we are at a later commit than the last tag
-            commit="$(git_fact current_branch).g$(git_fact latest_sha)"
-        fi
-        git_bool dirty; dirty=$?
-        test -n "$latest_tag" && version=${latest_tag:1}
-        case "$dirty:$commit" in
-            1:)  suffix=""               ;;
-            0:)  suffix="+dirty"         ;;
-            1:*) suffix="+$commit"       ;;
-            0:*) suffix="+$commit.dirty" ;;
-            *)   suffix=MKIT_BUG
-                 warn "MKIT_BUG: bad dirt/commit detection" ;;
-        esac
-        test -n "$prerl" && suffix="-$prerl$suffix"
-        version="$version$suffix"
+    git_present || {
+        echo UNKNOWN_VERSION
+        warn "no git present; could not determine SemVer"
+        return 3
+    }
+    latest_tag=$(git_fact latest_tag)
+    case $latest_tag in
+        v*) xyz=${latest_tag:1} ;;
+        "") warn "no tags, using base version from mkit.ini (ok for new project)"
+            xyz=$(ini 1value project:version) ;;
+        *)  warn "bad form of last tag, using base version from mkit.ini: tag is '$latest_tag'"
+            xyz=$(ini 1value project:version) ;;
+    esac
+    if ! git describe --tags --exact-match HEAD >&/dev/null;
+    then    # we are at a later commit than the last tag
+        commit="$(git_fact current_branch).g$(git_fact latest_sha)"
     fi
-    local_putb semver <<<"$version"
-    echo "$version"
+    git_bool dirty && dirty=T
+    case "$dirty:$btime:$commit" in
+        F:*:)   suffix=""                       ;;
+        T::)    suffix="+dirty"                 ;;
+        T:*:)   suffix="+t$btime.dirty"           ;;
+        F::*)   suffix="+$commit"               ;;
+        F:*:*)  suffix="+t$btime.$commit"         ;;
+        T::*)   suffix="+$commit.dirty"         ;;
+        T:*:*)  suffix="+t$btime.$commit.dirty"   ;;
+        *)      suffix=MKIT_BUG
+                warn "MKIT_BUG: bad dirt/commit detection" ;;
+    esac
+    test -n "$prerl" && suffix="-$prerl$suffix"
+    echo "$xyz$suffix"
 }

utils/mkit/include/ini.sh

@@ -2,7 +2,7 @@
 # MKit - simple install helper
 # See LICENSE file for copyright and license details.
 
-_ini_cat() {
+__ini_cat() {
     #
     # A no-op for text stream
     #
@@ -12,7 +12,7 @@ _ini_cat() {
     done
 }
 
-_ini_expand() {
+__ini_expand() {
     #
     # Expand reference value (prefix only)
     #
@@ -30,20 +30,26 @@ _ini_expand() {
     done
 }
 
-_ini_grepkey() {
+__ini_grepcmt() {
+    #
+    # Remove comments from INI file on stdin
+    #
+    grep -v '^[[:space:]]*#'
+}
+
+__ini_grepkey() {
     #
     # Read key from a section
     #
     local wnt=$1    # wanted key
     grep '.' \
-      | grep -v '\s*#' \
       | sed -e 's/ *= */=/; s/ +$//; s/^//;' \
       | grep -e "^$wnt=" \
       | cut -d= -f2- \
-      | _ini_maybe_expand
+      | __ini_maybe_expand
 }
 
-_ini_greppath() {
+__ini_greppath() {
     #
     # Read key from the right section
     #
@@ -62,10 +68,10 @@ _ini_greppath() {
          && echo "$override" \
          && return
     fi
-    _ini_grepsec "$wntsec" | _ini_grepkey "$wntkey"
+    __ini_grepsec "$wntsec" | __ini_grepkey "$wntkey"
 }
 
-_ini_grepsec() {
+__ini_grepsec() {
     #
     # Read one INI section
     #
@@ -73,7 +79,6 @@ _ini_grepsec() {
     local ok=false      # are we in the section?
     local line          # each input line
     grep '.' \
-      | grep -v '\s*#' \
       | while read -r line; do
             case "$line" in
                 \[$wnt\]) ok=true;  continue ;;
@@ -85,25 +90,51 @@ _ini_grepsec() {
       | sed -e 's/ *= */=/; s/ +$//; s/^//;'
 }
 
-_ini_lskeys() {
+__ini_lskeys() {
     #
     # List keys from a section
     #
     local sct=$1    # section of interest
-    _ini_grepsec "$sct" | cut -d= -f1 | awk '!x[$0]++'
+    __ini_grepsec "$sct" | cut -d= -f1 | awk '!x[$0]++'
+}
+
+__ini_lssect() {
+    #
+    # List all section names
+    #
+    local arg=$1    # unused argument
+    grep -x '\[.*\]' | sed 's/^.//; s/.$//'
 }
 
-_ini_maybe_expand() {
+__ini_maybe_expand() {
     #
     # Decide whether or not to expand
     #
     if test "$MKIT_INI_EXPAND" -gt 0; then
-        MKIT_INI_EXPAND=$(( --MKIT_INI_EXPAND )) _ini_expand
+        MKIT_INI_EXPAND=$(( --MKIT_INI_EXPAND )) __ini_expand
     else
-        _ini_cat
+        __ini_cat
     fi
 }
 
+__ini_body() {
+    #
+    # Produce mkit.ini body including INCLUDE
+    #
+    # Note: recursive includes are not supported.
+    #
+    local inc                       # file to include
+    local incre='\[INCLUDE:.*\]'    # include directive regex
+    local iline                     # include directive line
+    if iline=$(grep -m1 -x "$incre" "$MKIT_INI"); then
+        inc=${iline#*:}; inc=${inc%]}
+        grep -vx "$incre" "$inc"
+        grep -vx "$incre" "$MKIT_INI"
+    else
+        cat "$MKIT_INI"
+    fi | __ini_grepcmt
+}
+
 ini() {
     #
     # do ini operation
@@ -111,20 +142,21 @@ ini() {
     local op=$1             # operator
     local arg=$2            # argument
     local fn                # internal function implementing $op
-    local limit=_ini_cat    # limiting internal function
+    local limit=__ini_cat    # limiting internal function
     case $op in
-        lskeys) fn=_ini_lskeys   ;;
-        sec)    fn=_ini_grepsec  ;;
-        values) fn=_ini_greppath ;;
-        1value) fn=_ini_greppath; limit="tail -1" ;;
+        lskeys) fn=__ini_lskeys   ;;
+        lssect) fn=__ini_lssect   ;;
+        sec)    fn=__ini_grepsec  ;;
+        values) fn=__ini_greppath ;;
+        1value) fn=__ini_greppath; limit="tail -1" ;;
         *)      die "incorrect use of \`ini()\`"
     esac
-    <"$MKIT_INI" $fn "$arg" | $limit
+    __ini_body | $fn "$arg" | $limit
 }
 
 update_version() {
     #
-    # Change project.version in mkit.ini at path $2 to version $1
+    # Change project:version in mkit.ini at path $2 to value $1
     #
     local version=$1    # new version
     local inifile=$2    # mkit.ini path

utils/mkit/include/mkit.sh

@@ -30,12 +30,12 @@ mkit_import deploy
 mkit_import release
 mkit_import ini
 
-_valid_targets() {
+__valid_targets() {
     #
     # List valid routes
     #
+    echo _mkit_data
     echo build
-    echo build_manpages
     echo clean
     echo debstuff
     echo dist
@@ -66,17 +66,17 @@ debug_var() {
     #
     $MKIT_DEBUG || return 0
     local __mkit_debug_var_name__       # variable name to debug
+    local decl                          # declare string
     for __mkit_debug_var_name__ in "$@"; do
         {
-            echo -n "MKIT_DEBUG: ${FUNCNAME[1]}():"
-            echo -n " $__mkit_debug_var_name__"
-            echo -n "='${!__mkit_debug_var_name__}'"
-            echo
+            decl=$(declare -p "$__mkit_debug_var_name__")
+            decl=${decl#declare ?? }
+            echo "MKIT_DEBUG: ${FUNCNAME[1]}(): $decl"
         } >&2
     done
 }
 
-_compver() {
+__compver() {
     #
     # True if version $1 matches our version
     #
@@ -103,7 +103,7 @@ _compver() {
     return 0
 }
 
-_chkiniversion() {
+__chkiniversion() {
     #
     # Check if ini version is supported
     #
@@ -121,35 +121,10 @@ _chkiniversion() {
     test -n "$ver_line" \
      || die "version mark ('#mkit version=x.y.z') not found in: $MKIT_INI"
     their_ver="$(tr -d '[:blank:]v' <<<"${ver_line##*=}")"
-    _compver "$their_ver" \
+    __compver "$their_ver" \
      || die "bad mkit.ini version: $their_ver does not match $MKIT_VERSION"
 }
 
-local_putb() {
-    #
-    # Make file $1 in $MKIT_LOCAL from stdin and mark as built
-    #
-    local fpath=$1
-    local_put "$fpath" && rec_built "$MKIT_LOCAL/$fpath"
-}
-
-local_put() {
-    #
-    # Make file $1 in $MKIT_LOCAL from stdin
-    #
-    local fpath="$MKIT_LOCAL/$1"
-    { mkdir -p "${fpath%/*}" && cat >"$fpath"; } \
-     || die "cannot write to local cache: $fpath"
-}
-
-local_get() {
-    #
-    # Read file $1 in $MKIT_LOCAL
-    #
-    local fpath="$MKIT_LOCAL/$1"
-    cat "$fpath" 2>/dev/null
-}
-
 mkit_init() {
     #
     # Do basic initialization
@@ -160,30 +135,21 @@ mkit_init() {
     #shellcheck disable=SC2034
     MKIT_PROJ_PKGNAME=$(ini 1value "project:pkgname")
     test -f "$MKIT_INI" || die "cannot find mkit.ini: $MKIT_INI"
-    _chkiniversion
-}
-
-rec_built() {
-    #
-    # Record file $1 for deletion on `clean`
-    #
-    local file=$1
-    mkdir -p "$MKIT_LOCAL"
-    echo "$file" >> "$MKIT_LOCAL/built.lst"
+    __chkiniversion
 }
 
 route() {
     #
     # Call correct function based on $1
     #
-    if _valid_targets | grep -qwx "^$1"; then
+    if __valid_targets | grep -qwx "^$1"; then
         "$1"
     else
         {
             echo "usage: $(basename "$0") TARGET"
             echo
             echo "valid targets:"
-            _valid_targets | sed 's/^/    /'
+            __valid_targets | sed 's/^/    /'
         } >&2
     fi
 }

utils/mkit/include/release.sh

@@ -5,7 +5,7 @@
 mkit_import ini
 mkit_import facts
 
-_bump_version() {
+__bump_version() {
     #
     # Bump version on stdin by level $1 (x, y or z)
     #
@@ -30,7 +30,7 @@ _bump_version() {
     echo "$new"
 }
 
-_relck() {
+__relck() {
     #
     # Die if blocking condition $1 is detected
     #
@@ -68,7 +68,7 @@ _relck() {
              && die "WIP commit since $(git_fact latest_tag)"
             ;;
         ini_version)
-            oracle=$(git_fact latest_version | _bump_version "$rlevel")
+            oracle=$(git_fact latest_version | __bump_version "$rlevel")
             ini 1value project:version  \
               | grep -qFx "$oracle" \
              || die "new version not in mkit.ini: $oracle"
@@ -79,7 +79,7 @@ _relck() {
     esac
 }
 
-_release() {
+__release() {
     #
     # Prepare release
     #
@@ -94,19 +94,19 @@ _release() {
     local relsrc        # release source branch (if any)
     local reldst        # release destination branch (if any)
 
-    _relck git_present
-    _relck at_relsrc
-    _relck not_dirty
-    _relck tags_ok
-    _relck vbump_hot
-    _relck no_wip
-    _relck ini_version
+    __relck git_present
+    __relck at_relsrc
+    __relck not_dirty
+    __relck tags_ok
+    __relck vbump_hot
+    __relck no_wip
+    __relck ini_version
 
-    newtag=$(git_fact latest_version | _bump_version "$rlevel" | git_ver2tag )
+    newtag=$(git_fact latest_version | __bump_version "$rlevel" | git_ver2tag )
     set -e
     debug_var newtag
     $MKIT_DRY && return
-    git tag -m "$(_release_msg)" "$newtag"
+    git tag -m "$(__release_msg)" "$newtag"
 
     relsrc=$(ini 1value project:relsrc)
     reldst=$(ini 1value project:reldst)
@@ -116,7 +116,7 @@ _release() {
     fi
 }
 
-_release_msg() {
+__release_msg() {
     #
     # Generate message for annotated tag
     #
@@ -133,7 +133,7 @@ _release_msg() {
       | tail -n +3
 }
 
-_vbump() {
+__vbump() {
     #
     # Do version bump at level $1
     #
@@ -142,17 +142,21 @@ _vbump() {
     #
     local rlevel=$1     # bump level (x, y or z)
     local nextver       # version after the bump
-    _relck git_present
-    _relck at_relsrc
-    _relck not_dirty
-    nextver=$(ini 1value project:version | _bump_version "$rlevel")
+    local cache         # cache for the message
+    __relck git_present
+    __relck at_relsrc
+    __relck not_dirty
+    nextver=$(ini 1value project:version | __bump_version "$rlevel")
     debug_var nextver
     $MKIT_DRY && return
     update_version "$nextver" mkit.ini \
       || die "failed to update version in mkit.ini"
     git add mkit.ini \
       || die "failed to add mkit.ini to the index"
-    git commit -e -m "$(_vbump_gitmsg)"
+    cache=$(mktemp -t "mkit._vbump_gitmsg.XXXXXXXX")
+    _vbump_gitmsg > "$cache"
+    git commit -e -F "$cache"   # note: reading from stdin will break vim
+    rm "$cache"
 }
 
 _vbump_gitmsg() {
@@ -165,7 +169,7 @@ _vbump_gitmsg() {
     echo ""
     git_fact reldiff \
       | sed '
-            s/^[a-f0-9]\{7\} / *  &/; t PATHS
+            s/^[a-f0-9]\{7\} /\n *  &/; t PATHS
             s/^/        /
             :PATHS
         '
@@ -175,54 +179,54 @@ release() {
     #
     # Perform release on Z level
     #
-    _release z
+    __release z
 }
 
 release_x() {
     #
     # Perform release on X level
     #
-    _release x
+    __release x
 }
 
 release_y() {
     #
     # Perform release on Y level
     #
-    _release y
+    __release y
 }
 
 release_z() {
     #
     # Perform release on Z level
     #
-    _release z
+    __release z
 }
 
 vbump() {
     #
     # Perform version bump on Z level
     #
-    _vbump z
+    __vbump z
 }
 
 vbump_x() {
     #
     # Perform version bump on X level
     #
-    _vbump x
+    __vbump x
 }
 
 vbump_y() {
     #
     # Perform version bump on Y level
     #
-    _vbump y
+    __vbump y
 }
 
 vbump_z() {
     #
     # Perform version bump on Z level
     #
-    _vbump z
+    __vbump z
 }

utils/mkit/include/vars.sh

@@ -51,11 +51,39 @@ MKIT_LOCAL=${MKIT_LOCAL:-.mkit}
 #
 # Package name
 #
-# Used as base for tarball and in some default tokens.
+# Used as base for tarball and in some default macros.
 #
 MKIT_PROJ_PKGNAME=""
 
+#
+# Add time-based ordinal tag to SemVer build data?
+#
+# Can be 'none', 'ctime' or 'btime'.
+#
+# If 'ctime', devel builds have also timestamp-based tag in format of
+# `t%Y%m%d%H%M%S`, that is, a small character 't' followed by timestamp
+# without non-digit characters.  The timestamps are in UTC, ie. timezones
+# need not apply.  'btime' has the same format, except that it's derived
+# from build time, while 'ctime' is from last commit's commit date.
+#
+# This helps with deploying development builds where packaging system
+# is not SemVer-compliant and makes it hard to install arbitrary version.
+# For example, old yum version (as of RHEL-6) will not let you install
+# version that it deems older than is installed, making it hard to
+# continually upgrade during active development.  While packaging
+# systems have their own rukes (and SemVer says both versions should be
+# considered same) this tag will make it more likely to "win" the build
+# you made later.
+#
+# Note that this does not affect clean builds (ie. builds from clean
+# repo with HEAD corresponding to latest version tag.).
+#
+# Also note that 'btime' makes the version non-deterministic: merely
+# initiating the build a second later will result in different version.
+#
+MKIT_TTAG=${MKIT_TTAG:-ctime}
+
 #
 # This MKit version
 #
-MKIT_VERSION=0.0.25
+MKIT_VERSION=0.0.34

utils/mkit/mkit.mk

@@ -5,52 +5,52 @@ export MKIT_DIR
 
 all: build
 
-build:
-	@$(MKIT_DIR)/make build
+_mkit_data:
+	@"$(MKIT_DIR)"/make _mkit_data
 
-manpages: build
-	@$(MKIT_DIR)/make build_manpages
+build:
+	@"$(MKIT_DIR)"/make build
 
 clean:
-	@$(MKIT_DIR)/make clean
+	@"$(MKIT_DIR)"/make clean
 
 debstuff: dist
-	@$(MKIT_DIR)/make debstuff
+	@"$(MKIT_DIR)"/make debstuff
 
 dist: clean
-	@$(MKIT_DIR)/make dist
+	@"$(MKIT_DIR)"/make dist
 
 rpmstuff: dist
-	@$(MKIT_DIR)/make rpmstuff
+	@"$(MKIT_DIR)"/make rpmstuff
 
 install: all
-	@$(MKIT_DIR)/make install
+	@"$(MKIT_DIR)"/make install
 
 release:
-	@$(MKIT_DIR)/make release
+	@"$(MKIT_DIR)"/make release
 
 release_x:
-	@$(MKIT_DIR)/make release_x
+	@"$(MKIT_DIR)"/make release_x
 
 release_y:
-	@$(MKIT_DIR)/make release_y
+	@"$(MKIT_DIR)"/make release_y
 
 release_z:
-	@$(MKIT_DIR)/make release_z
+	@"$(MKIT_DIR)"/make release_z
 
 uninstall:
-	@$(MKIT_DIR)/make uninstall
+	@"$(MKIT_DIR)"/make uninstall
 
 vbump:
-	@$(MKIT_DIR)/make vbump
+	@"$(MKIT_DIR)"/make vbump
 
 vbump_x:
-	@$(MKIT_DIR)/make vbump_x
+	@"$(MKIT_DIR)"/make vbump_x
 
 vbump_y:
-	@$(MKIT_DIR)/make vbump_y
+	@"$(MKIT_DIR)"/make vbump_y
 
 vbump_z:
-	@$(MKIT_DIR)/make vbump_z
+	@"$(MKIT_DIR)"/make vbump_z
 
-.PHONY: all clean dist rpmstuff install uninstall release release_x release_y release_z vbump vbump_x vbump_y vbump_z
+.PHONY: all _mkit_data clean dist rpmstuff install uninstall release release_x release_y release_z vbump vbump_x vbump_y vbump_z

utils/mkit/stub

@@ -58,7 +58,6 @@ deploy() {
             echo "$any_name"
             tr -c '=\n' '=' <<<"$any_name"
             echo ''
-            echo ''
             if test -n "$Tagline"; then
                 echo "$Tagline"
             else
@@ -68,72 +67,84 @@ deploy() {
 
         */mkit.ini|mkit.ini)
             echo "[project]"
-            echo "    version     = $Version"
-            test -n "$Codename"     && echo "    codename    = $Codename"
-            test -n "$NiceName"     && echo "    name        = $NiceName"
-            test -n "$Tagline"      && echo "    tagline     = $Tagline"
-            test -n "$PackageName"  && echo "    pkgname     = $PackageName"
-            test -n "$Maintainer"   && echo "    maintainer  = $Maintainer"
-            test -n "$VcsBrowser"   && echo "    vcs_browser = $VcsBrowser"
-            test -n "$RelSrc"       && echo "    relsrc      = $RelSrc"
-            test -n "$RelDst"       && echo "    reldst      = $RelDst"
+            {
+                echo "version = $Version"
+                test -n "$Codename"     && echo "codename    = $Codename"
+                test -n "$NiceName"     && echo "name        = $NiceName"
+                test -n "$Tagline"      && echo "tagline     = $Tagline"
+                test -n "$PackageName"  && echo "pkgname     = $PackageName"
+                test -n "$Maintainer"   && echo "maintainer  = $Maintainer"
+                test -n "$VcsBrowser"   && echo "vcs_browser = $VcsBrowser"
+                test -n "$RelSrc"       && echo "relsrc      = $RelSrc"
+                test -n "$RelDst"       && echo "reldst      = $RelDst"
+            } | reformat_section
             if updating; then
                 remake_section dist
                 remake_section ENV
                 remake_section roots
-                remake_section tokens
+                remake_section macros
                 remake_section modes
                 remake_section files
             else
                 echo ""
                 echo "[dist]"
-                $MkLicense  && echo "    tarball = LICENSE.md"
-                $MkMakefile && echo "    tarball = Makefile"
-                $MkReadme   && echo "    tarball = README.md"
-                echo "    tarball = mkit.ini"
-                $MkPackaging && echo "    tarball = packaging"
-                echo "    tarball = src"
-                echo "    tarball = tests"
-                echo "    tarball = utils"
-                $MkPackaging && echo "    rpmstuff = packaging/template.spec"
-                $MkPackaging && echo "    debstuff = packaging/debian"
+                {
+                    $MkLicense  && echo "tarball = LICENSE.md"
+                    $MkMakefile && echo "tarball = Makefile"
+                    $MkReadme   && echo "tarball = README.md"
+                    echo "tarball = mkit.ini"
+                    $MkPackaging && echo "tarball = packaging"
+                    echo "tarball = src"
+                    echo "tarball = tests"
+                    echo "tarball = utils"
+                    $MkPackaging && echo "rpmstuff = packaging/template.spec"
+                    $MkPackaging && echo "debstuff = packaging/debian"
+                } | reformat_section
                 echo ""
                 echo "[ENV]"
-                echo "    PREFIX = /usr/local"
+                {
+                    echo "    PREFIX = /usr/local"
+                } | reformat_section
                 echo ""
                 echo "[roots]"
-                echo "    bin     = [ENV:PREFIX]/bin"
-                echo "    doc     = [ENV:PREFIX]/share/doc/$PackageName"
+                {
+                    echo "bin = [ENV:PREFIX]/bin"
+                    echo "doc = [ENV:PREFIX]/share/doc/$PackageName"
+                } | reformat_section
                 echo ""
-                echo "[tokens]"
-                echo "    __${PackageName^^}_FOO__ = Barr.."
+                echo "[macros]"
+                {
+                    echo "__${PackageName^^}_FOO__ = Barr.."
+                } | reformat_section
                 echo ""
                 echo "[modes]"
-                echo "    bin     = 755"
-                echo "    doc     = 644"
+                {
+                    echo "bin = 755"
+                    echo "doc = 644"
+                } | reformat_section
                 echo ""
                 echo "[files]"
-                echo "    bin      = src/$PackageName"
-                $MkLicense && echo "    doc      = LICENSE.md"
-                $MkReadme  && echo "    doc      = README.md"
+                {
+                    echo "bin = src/$PackageName"
+                    $MkLicense && echo "doc = LICENSE.md"
+                    $MkReadme  && echo "doc = README.md"
+                } | reformat_section
             fi
             echo ""
             echo "#mkit version=$MKIT_VERSION"
             ;;
 
         packaging/template.spec)
-            echo 'Name:		__MKIT_PROJ_PKGNAME__'
-            echo 'Version:	__MKIT_PROJ_VERSION__'
-            echo 'Release:	1%{?dist}'
-            echo 'Summary:	__MKIT_PROJ_NAME__ - __MKIT_PROJ_TAGLINE__'
-            echo ''
-            $MkLicense && echo "License:	$License"
-            echo 'Source0:	%{name}-%{version}.tar.gz'
-            echo ''
-            echo 'BuildArch:	noarch'
-            echo 'BuildRequires:	coreutils git'
-            echo 'Requires:	MKIT_STUB_REQUIRES'
+            echo 'Name:       __MKIT_PROJ_PKGNAME__'
+            echo 'Version:    __MKIT_PROJ_VERSION__'
+            echo 'Release:    1%{?dist}'
+            echo 'Summary:    __MKIT_PROJ_NAME__ - __MKIT_PROJ_TAGLINE__'
+            test -n "$VcsBrowser" && echo 'URL:        __MKIT_PROJ_VCS_BROWSER__'
+            $MkLicense && echo "License:    $License"
+            echo 'Source0:    %{name}-%{version}.tar.gz'
+            echo 'BuildArch:  noarch'
             echo ''
+            echo 'Requires: MKIT_STUB_REQUIRES'
             echo '%description'
             echo 'MKIT_STUB_DESCRIPTION'
             echo ''
@@ -165,7 +176,8 @@ deploy() {
             echo 'Section: misc'
             echo 'Priority: extra'
             echo 'Standards-Version: 3.9.2'
-            echo 'Build-Depends: debhelper (>= 9)'
+            echo 'Build-Depends:'
+            echo ' debhelper (>= 9),'
             echo ''
             echo 'Package: __MKIT_PROJ_PKGNAME__'
             echo 'Architecture: all'
@@ -198,17 +210,13 @@ deploy() {
             echo 'override_dh_auto_install:'
             echo ''
             echo '	make install PREFIX=/usr DESTDIR=debian/tmp'
-            echo ''
-            echo 'override_dh_usrlocal:'
-            echo ''
-            echo '	@true'
             ;;
 
         packaging/debian/source/format)
             echo '3.0 (quilt)'
             ;;
 
-        packaging/debian/*.install)
+        packaging/debian/install)
             echo MKIT_STUB_FILELIST
             ;;
 
@@ -237,7 +245,6 @@ deploy() {
             echo "everything, so few things still need to be done manually."
             echo "This document will guide you throught the rest of the"
             echo "process."
-
             echo ""
             echo ""
             echo "Structure"
@@ -251,7 +258,7 @@ deploy() {
             echo "    machine should be uder 'src'."
             echo ""
             echo "    Note that during build time, files named ending with"
-            echo "    '.skel' are subject to token expansion, see mkit.ini"
+            echo "    '.skel' are subject to macro expansion, see mkit.ini"
             echo "    section below for details."
             echo ""
             echo " *  *notes* directory - here you shall store notes"
@@ -272,7 +279,7 @@ deploy() {
             echo " *  *packaging* directory contains templates that enable"
             echo "    MKit create raw stuffs used to create DEB or RPM"
             echo "    packages.  Similar to '.skel' files in 'src', all files"
-            echo "    here are automatically considered for token expansion,"
+            echo "    here are automatically considered for macro expansion,"
             echo "    no matter how they are named (see mkit.ini section"
             echo "    below)."
             echo ""
@@ -285,7 +292,6 @@ deploy() {
             echo "    idea!), be prepared that you will need to follow their"
             echo "    guidelines.  This will most probably mean huge changes"
             echo "    to these packages or even changes to your workflow."
-
             echo ""
             echo ""
             echo "Placeholders"
@@ -318,9 +324,9 @@ deploy() {
             echo "     *  \`MKIT_STUB_FILELIST\` - List of full paths to"
             echo "        your files after installation."
             echo ""
-            echo "        Note that in case of debian/package.install files,"
-            echo "        PREFIX based paths (eg. /usr/bin) in this file should"
-            echo "        should be as if PREFIX was /usr."
+            echo "        Note that in case of debian/install files, PREFIX"
+            echo "        based paths (eg. /usr/bin) in this file should be as"
+            echo "        if PREFIX was /usr."
             echo ""
             echo "        In case of Fedora-based distro, you should make use"
             echo "        of RPM macros:"
@@ -349,7 +355,6 @@ deploy() {
             echo "    Typical example of a role is e.g. 'bin' for commands"
             echo "    (normally under '/usr/bin' or '/usr/local/bin'), 'doc'"
             echo "    for documents or 'lib' for libraries."
-
             echo ""
             echo " 2. Next, in \`[roots]\` section, you have to set target"
             echo "    root directory for each role.  However, in order to"
@@ -358,7 +363,6 @@ deploy() {
             echo "    environment variable.  For this reason, most paths"
             echo "    need to start with \`[ENV:PREFIX]\`."
             echo ""
-
             echo " 3. \`[files]\` section is where you assign actual files"
             echo "    from your repository to their final paths.  The format"
             echo "    is \`ROLE = REPOPATH [RENAMED]\`, where ROLE is file's"
@@ -373,22 +377,19 @@ deploy() {
             echo "    individually, if in your repo you have a directory with"
             echo "    100 files of the same role, you can add just path to the"
             echo "    directory itself."
-
             echo ""
             echo " 4. If some roles require special permissions on your files,"
             echo "    \`[modes]\` section is your friend.  Permissions here"
             echo "    should be in UNIX octal format."
-
             echo ""
-            echo " 5. Next, \`[tokens]\` section allows you to define own"
+            echo " 5. Next, \`[macros]\` section allows you to define own"
             echo "    placeholders that will be replaced when your scripts are"
             echo "    built.  Each file in 'src' directory that is named with"
             echo "    '.skel' suffix, and each file from 'packaging' directory"
-            echo "    (no matter its name), can contain one or more of tokens"
-            echo "    defined here, plus range of tokens automatically defined"
-            echo "    by MKit.  During build, these tokens are replaced with"
+            echo "    (no matter its name), can contain one or more of macros"
+            echo "    defined here, plus range of macros automatically defined"
+            echo "    by MKit.  During build, these macros are replaced with"
             echo "    their actual values."
-
             echo ""
             echo " 6. Less interesting, but important section is \`[dist]\`,"
             echo "    which lists files in your codebase that will be added"
@@ -396,14 +397,12 @@ deploy() {
             echo "    above).  Listing directory here will include all its"
             echo "    contents, and normally it's OK to be very inclusive, so"
             echo "    most of the time this section should be OK."
-
             echo ""
             echo " 7. Even less interesting is section \`[ENV]\`.  It is"
             echo "    special in that it provides *default* value for an"
             echo "    environment variable.  You almost never need to touch"
             echo "    this."
             echo ""
-
             echo " 8. Finally, the most interesting section!  \`[project]\`,"
             echo "    provides most general information for your project such"
             echo "    as name and version."
@@ -486,7 +485,7 @@ usage() {
         echo "    -R            skip creating README.md"
         echo "    -M            skip creating Makefile"
         echo "    -P            skip creating packaging templates"
-        echo "    -L            list know licenses and exit"
+        echo "    -L            list known licenses and exit"
         echo ""
         echo "PKGNAME should be packaging-friendly name, ie. consist"
         echo "only of small letters, numbers, underscore and dash."
@@ -551,9 +550,9 @@ deploy_packaging() {
     deploy packaging/debian/control
     deploy packaging/debian/changelog
     deploy packaging/debian/compat
+    deploy packaging/debian/install
     deploy packaging/debian/rules
     deploy packaging/debian/source/format
-    deploy packaging/debian/"$PackageName".install
 }
 
 init_from_existing() {
@@ -615,7 +614,25 @@ remake_section() {
                     echo "$key = $value"
                 done
         done \
-      | column -to' ' \
+      | reformat_section
+}
+
+reformat_section() {
+    #
+    # Re-format "k = v" on stdin as "nice" ini section
+    #
+    local key
+    local eq
+    local value
+    while read -r key eq value; do
+        test "$eq" == "=" || {
+            warn "ignoring malformed ini line: $key $eq $value"
+            continue
+        }
+        echo "$key = $value"
+    done \
+      | sed 's/ *= */=/; s/^ *//; s/ *$//' \
+      | column -t -s= -o' = ' \
       | sed 's/^/    /'
 }