Update own dogfood

utils/mkit/include/build.sh

@@ -17,8 +17,7 @@ _build1() {
     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"
+    rec_built "$dstpath"
 }
 
 _build1_ftype() {
@@ -120,7 +119,8 @@ build() {
     # Add meat to all skeletons
     #
     local srcpath   # each source path
-    find -type f -name '*.skel' \
+    semver >/dev/null
+    find . -type f -name '*.skel' \
      | while read -r srcpath; do
            _build1 "$srcpath"
        done
@@ -137,8 +137,7 @@ build_manpages() {
           | while read -r manfile; do
                 mdfile="$manfile.md"
                 ronn -r "$mdfile"
-                mkdir -p "$MKIT_LOCAL"
-                echo "$manfile" >> "$MKIT_LOCAL/built.lst"
+                rec_built "$manfile"
             done
     else
         echo "ronn is not installed"
@@ -174,7 +173,7 @@ debstuff() {
     mv "${MKIT_PROJ_PKGNAME}-$version.tar.gz" \
        "${MKIT_PROJ_PKGNAME}_$version.orig.tar.gz" \
      || die "could not rename tarball"
-    echo "${MKIT_PROJ_PKGNAME}_$version.orig.tar.gz" >> "$MKIT_LOCAL/built.lst"
+    rec_built "${MKIT_PROJ_PKGNAME}_$version.orig.tar.gz"
 
     # read content of each mandatory file from debian_skel
     #
@@ -188,7 +187,7 @@ debstuff() {
             mkdir -p "$(dirname "$dftgt")"
             _build1 "$dfsrc" "$dftgt" debstuff
         done
-    echo debian >> "$MKIT_LOCAL/built.lst"
+    rec_built debian
 }
 
 dist() {
@@ -211,8 +210,7 @@ dist() {
     echo -n "$git_lasthash" > "$dirname/.mkit/git_lasthash"
     tar -cf "$dirname.tar" "$dirname"
     gzip -f "$dirname.tar"      # see above FIXME
-    mkdir -p "$MKIT_LOCAL"
-    echo "$dirname.tar.gz" >> "$MKIT_LOCAL/built.lst"
+    rec_built "$dirname.tar.gz"
     rm -rf "$dirname"
 }
 

utils/mkit/include/facts.sh

@@ -154,6 +154,7 @@ semver() {
     local commit        # commit indicator (CURRENT_BRANCH.gHASH)
     local dirty         # 0 if dirty, 1 if clean
     local suffix        # version suffix
+    local_get semver && return 0
     version=$(ini 1value project:version)
     prerl=$(ini 1value project:prerl)
     grep ":" <<<"$prerl" \
@@ -178,5 +179,6 @@ semver() {
         test -n "$prerl" && suffix="-$prerl$suffix"
         version="$version$suffix"
     fi
+    local_putb semver <<<"$version"
     echo "$version"
 }

utils/mkit/include/mkit.sh

@@ -125,6 +125,31 @@ _chkiniversion() {
      || 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
@@ -132,11 +157,19 @@ mkit_init() {
     # Check for ini file and some variables
     #
     $MKIT_DRY && MKIT_DEBUG=true
+    #shellcheck disable=SC2034
     MKIT_PROJ_PKGNAME=$(ini 1value "project:pkgname")
     test -f "$MKIT_INI" || die "cannot find mkit.ini: $MKIT_INI"
     _chkiniversion
-    test -n "$(tr -d '[:space:]' <<<"$MKIT_LOCAL")" \
-     || die "MKIT_LOCAL must be non-blank: '$MKIT_LOCAL'"
+}
+
+rec_built() {
+    #
+    # Record file $1 for deletion on `clean`
+    #
+    local file=$1
+    mkdir -p "$MKIT_LOCAL"
+    echo "$file" >> "$MKIT_LOCAL/built.lst"
 }
 
 route() {

utils/mkit/include/vars.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+#shellcheck disable=SC2034
 # MKit - simple install helper
 # See LICENSE file for copyright and license details.
 
@@ -57,4 +58,4 @@ MKIT_PROJ_PKGNAME=""
 #
 # This MKit version
 #
-MKIT_VERSION=0.0.23+master.g1a2dd96
+MKIT_VERSION=0.0.24+master.g1446c26

utils/mkit/stub

@@ -141,7 +141,7 @@ deploy() {
             echo '%setup -q'
             echo ''
             echo '%build'
-            echo 'make %{?_smp_mflags}'
+            echo 'make %{?_smp_mflags} PREFIX=/usr'
             echo ''
             echo '%install'
             echo '%make_install PREFIX=/usr'
@@ -320,9 +320,7 @@ deploy() {
             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/local, despite PREFIX"
-            echo "        being set to /usr in debian/rules.  (Debian's script"
-            echo "        dh_usrlocal will take care of that.)"
+            echo "        should be as if PREFIX was /usr."
             echo ""
             echo "        In case of Fedora-based distro, you should make use"
             echo "        of RPM macros:"