Use mkit from fastfoo for installation

Makefile

@@ -3,10 +3,7 @@
 
 include config.mk
 
-all: options built.list
-
-built.list:
-	@setup/mk.sh build
+all: options build
 
 options:
 	@echo saturnin build options:
@@ -14,27 +11,21 @@ options:
 	@echo "PREFIX   = ${PREFIX}"
 
 build:
-	@setup/mk.sh build
-
-install_manpages: manpages
-	@setup/mk.sh install_manpages
-
-manpages:
-	@setup/mk.sh manpages
+	@mkit/make build
 
-test: install
-	@setup/mk.sh test
+manpages: build
+	@mkit/make build_manpages
 
 clean:
-	@setup/mk.sh clean
+	@mkit/make clean
 
 dist: clean
-	@setup/mk.sh dist
+	@mkit/make dist
 
 install: all
-	@setup/mk.sh install
+	@mkit/make install
 
 uninstall:
-	@setup/mk.sh uninstall
+	@mkit/make uninstall
 
-.PHONY: all options clean dist install test uninstall
+.PHONY: all options clean dist install uninstall

config.mk

@@ -1,7 +1,3 @@
 VERSION = 0.0.11
 STAGE = devel
-PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
-SATURNIN_CONFIG_PATH_LOCAL = /etc/saturnin
-SATURNIN_CONFIG_PATH_USER = .saturnin
-SATURNIN_CACHE_HOME = .local/share/saturnin
+PREFIX=/usr/local

mkit/config.ini

@@ -0,0 +1,57 @@
+
+[ENV]
+
+    PROJNAME = saturnin
+    PREFIX = /usr
+
+[lists]
+
+    group = bin
+    group = libexec
+    group = share
+
+    dist = bin
+    dist = config.mk
+    dist = LICENSE
+    dist = Makefile
+    dist = mkit
+    dist = README
+    dist = src
+
+[modes]
+    bin     = 755
+    libexec = 755
+    share   = 644
+
+[roots]
+    bin     = [ENV:PREFIX]/bin
+    libexec = [ENV:PREFIX]/libexec/saturnin
+    share   = [ENV:PREFIX]/share/saturnin
+    etc     = /etc/saturnin
+
+[vars]
+    __SATURNIN_CACHE_HOME__     = $HOME/.local/share/saturnin
+    __SATURNIN_CONFIG_USER__    = $HOME/.saturnin
+    __SATURNIN_CONFIG_LOCAL__   = [roots:etc]
+    __SATURNIN_LIBEXEC__        = [roots:libexec]
+    __SATURNIN_SHARE__          = [roots:share]
+    __FFOO_DIR__                = [roots:share]/ffoo
+
+[files:bin]
+    src/bin/saturnin                        = saturnin
+
+[files:libexec]
+    src/libexec/saturnin-czrates            = saturnin-czrates
+    src/libexec/saturnin-clip               = saturnin-clip
+    src/libexec/saturnin-dmenu              = saturnin-dmenu
+    src/libexec/saturnin-iam                = saturnin-iam
+    src/libexec/saturnin-conf               = saturnin-conf
+    src/libexec/saturnin-ip                 = saturnin-ip
+    src/libexec/saturnin-ln                 = saturnin-ln
+    src/libexec/saturnin-push               = saturnin-push
+    src/libexec/saturnin-revert             = saturnin-revert
+    src/libexec/saturnin-watch              = saturnin-watch
+    src/libexec/saturnin-www                = saturnin-www
+
+[files:share]
+    src/ffoo/saturnin_www.sh                = ffoo/saturnin_www.sh

setup/mk.sh → mkit/include/build.sh

@@ -1,52 +1,24 @@
 #!/bin/bash
-# saturnin - Smart and ready desktop helper
-# See LICENSE file for copyright and license details.
 
-tmp=$(mktemp)
-sed -e 's/ = /=/' < config.mk > $tmp
-. $tmp
-rm -f $tmp
+. mkit/include/ini.sh || die "cannot import ini.sh"
 
-bindir=${DESTDIR}${PREFIX}/bin
-shrdir=${DESTDIR}${PREFIX}/share/saturnin
-lexdir=${DESTDIR}${PREFIX}/libexec/saturnin
 
-list_of_bins() {
-    echo bin/saturnin
-}
-
-list_of_lexs() {
-    echo libexec/saturnin-czrates
-    echo libexec/saturnin-clip
-    echo libexec/saturnin-dmenu
-    echo libexec/saturnin-iam
-    echo libexec/saturnin-conf
-    echo libexec/saturnin-ip
-    echo libexec/saturnin-ln
-    echo libexec/saturnin-push
-    echo libexec/saturnin-revert
-    echo libexec/saturnin-watch
-    echo libexec/saturnin-www
-}
-
-list_of_installed_bins() {
-    list_of_bins | sed -e "s/bin/$(sed -e 's/\//\\\//g' <<<$bindir)/"
-}
-
-list_of_installed_lexs() {
-    list_of_lexs | sed -e "s/libexec/$(sed -e 's/\//\\\//g' <<<$lexdir)/"
-}
-
-die() {
-    for l in "$@"; do echo "$l" >&2; done
-    exit 9
-}
-
-list_of_shrs() {
-    echo ffoo/saturnin_www.sh
+build() {
+    #
+    # Add meat to all skeletons
+    #
+    local srcpath
+    find src -type f -name '*.skel' \
+     | while read srcpath;
+       do
+           build1 "$srcpath"
+       done
 }
 
 build1() {
+    #
+    # Process one skeleton
+    #
     local srcpath dstpath
     srcpath=$1
     dstpath=${srcpath%.skel}
@@ -62,13 +34,21 @@ build1() {
     echo $dstpath >> built.list
 }
 
-build() {
-    local srcpath
-    find -type f -name '*.skel' \
-     | while read srcpath;
-       do
-           build1 "$srcpath"
-       done
+build_manpages() {
+    local manfile mdfile
+    if command -v ronn >/dev/null;
+    then
+        ini lskeys "files:man" \
+          | while read manfile;
+            do
+                mdfile=$manfile.md
+                ronn -r $mdfile
+                echo $manfile >> built.list
+            done
+    else
+        echo "ronn is not installed"
+        return 1
+    fi
 }
 
 clean() {
@@ -86,17 +66,10 @@ dist() {
     # Create distributable tarball
     #
     local version=$(get_version)
-    local dirname=saturnin-$version
+    local dirname=$MKIT_PROJNAME-$version
     mkdir -p $dirname
-    cp -R   bin \
-            config.mk \
-            ffoo \
-            Makefile \
-            README \
-            LICENSE \
-            setup \
-            utils \
-            $dirname
+    local item
+    cp -R $(ini values "lists:dist") $dirname
     sed -i -e "s/^VERSION = .*/VERSION = $version/" $dirname/config.mk
     tar -cf $dirname.tar $dirname
     gzip $dirname.tar
@@ -132,29 +105,18 @@ expand_variables() {
     #
     # Expand variable values
     #
-    perl -pe "
-        s|__SATURNIN_CONFIG_LOCAL__|$SATURNIN_CONFIG_PATH_LOCAL|;
-        s|__SATURNIN_CONFIG_USER__|\\\$HOME/$SATURNIN_CONFIG_PATH_USER|;
-        s|__SATURNIN_CACHE_HOME__|\\\$HOME/$SATURNIN_CACHE_HOME|;
-        s|__SATURNIN_SHARE__|$shrdir|;
-        s|__SATURNIN_LIBEXEC__|$lexdir|;
-        s|__VERSION__|$(get_version)|;
-    "
-}
-
-install() {
-    #
-    # Install product
-    #
-    mkdir -vp $bindir \
-              $shrdir/ffoo \
-              $lexdir
-    list_of_bins | xargs cp -vrt $bindir
-    list_of_shrs | xargs cp -vrt $shrdir/ffoo
-    list_of_lexs | xargs cp -vrt $lexdir
-    list_of_installed_bins | xargs chmod -v 755
-    list_of_installed_lexs | xargs chmod -v 755
-    test -f .autoclean && clean || :
+    local script=$(mktemp --tmpdir mkit-tmp.XXXXXXXXXX)
+    local varname varvalue
+    ini lskeys "vars" \
+      | while read varname;
+        do
+            varvalue="$(ini 1value "vars:$varname" | sed -e 's/\$/\\$/' )"
+            echo "s|$varname|$varvalue|;" >> $script
+        done
+    echo "s|__CODENAME__|$CODENAME|;"     >> $script
+    echo "s|__VERSION__|$(get_version)|;" >> $script
+    perl -wp $script
+    rm $script
 }
 
 get_version() {
@@ -198,6 +160,10 @@ get_version() {
     # meta-data is to *identify* the code, and provide safe path back
     # to tree; commit refs are already perfect for that.
     #
+    # FIXME:  The assumpton "if we are in git repo, we can read version
+    #         from tags" fails if we are in shallow clone made from
+    #         other than a tagged commit.
+    #
     local version=$VERSION
     local stage=$STAGE
     if git rev-parse HEAD >&/dev/null;
@@ -227,20 +193,3 @@ get_version() {
     fi
     echo $version
 }
-
-uninstall() {
-    #
-    # Uninstall product
-    #
-    list_of_installed_bins | xargs rm -vf
-    rm -vrf $shrdir
-    rm -vrf $lexdir
-}
-
-case $1 in
-    build|clean|dist|install|install_manpages|manpages|uninstall)
-        $1
-        ;;
-    *)
-        echo "usage: $(basename $0) build|clean|dist|install|uninstall" >&2
-esac

mkit/include/deploy.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+
+
+get_dst() {
+    #
+    # Find out target path for src file $2 of group $1
+    #
+    local grp=$1
+    local src=$2
+    echo "$(get_root $grp)/$(ini 1value "files:$grp:$src")"
+}
+
+get_root() {
+    #
+    # Find out target rooot for group $1
+    #
+    local grp="$1"
+    local root=$(ini 1value "roots:$grp")
+    test -n "$root" || die "missing in config.ini: roots:$grp"
+    echo "$root"
+}
+
+install() {
+    #
+    # Install product
+    #
+    local dst group mode src
+    ini values "lists:group" \
+      | while read group;
+        do
+            mode=$(ini 1value "modes:$group")
+            ini lskeys "files:$group" \
+              | while read src;
+                do
+                    dst=$(get_dst "$group" "$src")
+                    command -p install -DTvm $mode $src "$dst"
+                done
+        done
+    test -f .autoclean && clean || :
+}
+
+uninstall() {
+    #
+    # Uninstall product
+    #
+    local dst group src
+    ini values "lists:group" \
+      | while read group;
+        do
+            ini lskeys "files:$group" \
+              | while read src;
+                do
+                    dst=$(get_dst "$group" "$src")
+                    rm -vf "$dst"
+                done
+        done
+}

mkit/include/ini.sh

@@ -0,0 +1,139 @@
+#!/bin/bash
+
+ini() {
+    #
+    # do ini operation
+    #
+    local op=$1
+    local arg=$2
+    local fn
+    local limit=_ini_cat
+    case $op in
+        lskeys) fn=_ini_lskeys   ;;
+        sec)    fn=_ini_grepsec  ;;
+        values) fn=_ini_greppath ;;
+        1value) fn=_ini_greppath; limit="tail -1" ;;
+        *)      die "incorrect use of \`ini()\`"
+    esac
+    _ini_cached | $fn $arg | $limit
+}
+
+_ini_cached() {
+    #
+    # Load ini file to our cache (RAM disk) and cat it
+    #
+    # User should set MKIT_INI_CACHE to a ram-based file
+    # if mktemp cannot be relied upon.
+    #
+    if test -z "$_MKIT_INI_CACHED";
+    then
+        MKIT_INI_CACHE=${MKIT_INI_CACHE:-$(mktemp)}
+        _MKIT_INI_CACHED=$MKIT_INI_CACHE
+        test -r $MKIT_INI || die "cannot read MKIT_INI: $MKIT_INI"
+        cp $MKIT_INI $_MKIT_INI_CACHED
+    fi
+    cat $_MKIT_INI_CACHED
+}
+
+_ini_cat() {
+    #
+    # A no-op for text stream
+    #
+    while read line;
+    do
+        printf -- "%s\n" "$line"
+    done
+}
+
+_ini_expand() {
+    #
+    # Expand reference value (prefix only)
+    #
+    local line suffix ref value
+    while read line;                        # [foo:bar]/path
+    do
+        suffix="${line#\[*\]}"              # /path
+        ref="${line%$suffix}"               # [foo:bar]
+        ref="${ref%\]}"                     # [foo:bar
+        ref="${ref#\[}"                     # foo:bar
+        value="$(ini 1value "$ref")"        # foo_bar_value
+        printf -- "%s\n" "$value$suffix"    # foo_bar_value/path
+    done
+}
+
+_ini_grepkey() {
+    #
+    # Read key from a section
+    #
+    local wnt=$1
+    grep '.' \
+      | grep -v '\s*#' \
+      | sed -e 's/ *= */=/; s/ +$//; s/^//;' \
+      | grep -e "^$wnt=" \
+      | cut -d= -f2- \
+      | _ini_maybe_expand
+}
+
+_ini_greppath() {
+    #
+    # Read key from the right section
+    #
+    # E.g. `files:share:my/lib.sh` should read
+    #
+    #     [files:share]
+    #         my/lib.sh   = proj/my/lib.sh
+    #
+    local wnt=$1
+    local wntkey=${wnt##*:}
+    local wntsec=${wnt%:$wntkey}
+    if test "$wntsec" = 'ENV';
+    then
+        local override="${!wntkey}"
+        if test -n "$override";
+        then
+            echo "$override"
+            return
+        fi
+    fi
+    _ini_grepsec $wntsec | _ini_grepkey $wntkey
+}
+
+_ini_grepsec() {
+    #
+    # Read one INI section
+    #
+    local wnt=$1
+    local ok=false
+    grep '.' \
+      | grep -v '\s*#' \
+      | while read line;
+        do
+            case "$line" in
+                \[$wnt\]) ok=true;  continue ;;
+                \[*\])    ok=false; continue ;;
+            esac
+            $ok || continue
+            printf -- "%s\n" "$line"
+        done \
+      | sed -e 's/ *= */=/; s/ +$//; s/^//;'
+}
+
+_ini_lskeys() {
+    #
+    # List keys from a section
+    #
+    local sct=$1
+    _ini_grepsec $sct | cut -d= -f1 | sort | uniq
+}
+
+_ini_maybe_expand() {
+    #
+    # Decide whether or not to expand
+    #
+    if test $MKIT_INI_EXPAND -gt 0;
+    then
+        MKIT_INI_EXPAND=$(( $MKIT_INI_EXPAND - 1 )) _ini_expand
+    else
+        _ini_cat
+    fi
+}

mkit/include/mkit.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+. mkit/include/build.sh  || die "cannot import ini.sh"
+. mkit/include/deploy.sh || die "cannot import ini.sh"
+. mkit/include/ini.sh    || die "cannot import ini.sh"
+
+MKIT_INI=${MKIT_INI:-mkit/config.ini}
+MKIT_INI_EXPAND=2
+MKIT_PROJNAME=$(ini 1value "ENV:PROJNAME")
+
+configure() {
+    #
+    # Load variables fdom config.mk
+    #
+    tmp=$(mktemp)
+    sed -e 's/ = /=/' < config.mk > $tmp
+    . $tmp
+    rm -f $tmp
+    PREFIX="$(readlink -f "$PREFIX")"
+}
+
+die() {
+    #
+    # Exit with message and non-zero exit status
+    #
+    echo "$@" >&2
+    exit 4
+}
+
+route() {
+    #
+    # Call correct function based on $1
+    #
+    case $1 in
+        build|build_manpages|clean|dist|install|uninstall)
+            $1
+            ;;
+        *)
+            echo "usage: $(basename $0) build|clean|dist|install|uninstall" >&2
+    esac
+}

mkit/make

@@ -0,0 +1,13 @@
+#!/bin/bash
+# mkit - simple install helper
+# See LICENSE file for copyright and license details.
+
+die() {
+    echo "$@" && exit 9
+}
+
+. mkit/include/mkit.sh || die "this must be run from project root"
+
+configure
+
+route "$@"