Update own dogfood

utils/mkit/include/deploy.sh

@@ -40,6 +40,7 @@ __deploy_item() {
                 __deploy_item "$item" "$dst${item#$src}" "$mode"
             done
     else
+        test "$mode" == "SRC" && mode=$(stat -c "%a" "$src")
         __maybe install -DTvm "$mode" "$src" "$dst"
     fi
 }

utils/mkit/include/release.sh

@@ -142,6 +142,7 @@ __vbump() {
     #
     local rlevel=$1     # bump level (x, y or z)
     local nextver       # version after the bump
+    local cache         # cache for the message
     __relck git_present
     __relck at_relsrc
     __relck not_dirty
@@ -152,7 +153,10 @@ __vbump() {
       || 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() {

utils/mkit/include/vars.sh

@@ -58,4 +58,4 @@ MKIT_PROJ_PKGNAME=""
 #
 # This MKit version
 #
-MKIT_VERSION=0.0.25+master.gf8bcff1
+MKIT_VERSION=0.0.26+master.gd8016d5

utils/mkit/stub

@@ -68,15 +68,17 @@ 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
@@ -87,53 +89,63 @@ deploy() {
             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 "__${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 'Name:     __MKIT_PROJ_PKGNAME__'
+            echo 'Version:  __MKIT_PROJ_VERSION__'
+            echo 'Release:  1%{?dist}'
+            echo 'Summary:  __MKIT_PROJ_NAME__ - __MKIT_PROJ_TAGLINE__'
+            $MkLicense && echo "License:  $License"
             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 'Source0:       %{name}-%{version}.tar.gz'
+            echo 'BuildArch:     noarch'
             echo ''
+            echo 'Requires: MKIT_STUB_REQUIRES'
             echo '%description'
             echo 'MKIT_STUB_DESCRIPTION'
             echo ''
@@ -615,6 +627,23 @@ remake_section() {
                     echo "$key = $value"
                 done
         done \
+      | 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 \
       | column -to' ' \
       | sed 's/^/    /'
 }