Update mk.sh from fastfoo

setup/mk.sh

@@ -38,10 +38,15 @@ build1() {
     local srcpath dstpath
     srcpath=$1
     dstpath=${srcpath%.skel}
-    perl -pe "
-        s|__SATURNIN_INI_PATH__|$SATURNIN_INI_PATH_GLOBAL:\\\$HOME/$SATURNIN_INI_PATH_USER|;
-        s|__VERSION__|$(get_version)|;
-    " < $srcpath > $dstpath
+    case $dstpath in
+        *.md)   cat $srcpath \
+                  | expand_includes \
+                  | expand_variables \
+                > $dstpath ;;
+        *)      cat $srcpath \
+                  | expand_variables \
+                > $dstpath ;;
+    esac
     echo $dstpath >> built.list
 }
 
@@ -79,6 +84,40 @@ dist() {
     rm -rf $dirname
 }
 
+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_variables() {
+    #
+    # Expand variable values
+    #
+    perl -pe "
+        s|__SATURNIN_INI_PATH__|$SATURNIN_INI_PATH_GLOBAL:\\\$HOME/$SATURNIN_INI_PATH_USER|;
+        s|__VERSION__|$(get_version)|;
+    "
+}
 install() {
     mkdir -vp $bindir
     list_of_bins | xargs cp -vrt $bindir
@@ -91,7 +130,7 @@ get_version() {
     local stage=$STAGE
     if git rev-parse HEAD >&/dev/null;
     then    # we are in git repo... so we can get smart
-        local lasttag=$(git tag | grep ^v | tail -n1)
+        local lasttag=$(git tag | grep ^v | sort -V | tail -n1)
         if ! git describe --tags --exact-match HEAD >&/dev/null;
         then    # we are not at later commit than the last tag
             local sha=g$(git describe --always HEAD)
@@ -101,6 +140,7 @@ get_version() {
             local dirty=dirty
         fi
         version=${lasttag:1}
+        local suffix=""
         case $stage:$sha:$dirty in
             ::)         suffix=""                    ;;
             ::dirty)    suffix="+$dirty"             ;;
@@ -116,16 +156,6 @@ get_version() {
     echo $version
 }
 
-run_test() {
-    pushd test
-    find -maxdepth 1 -type f \! -name '*.skel' | while read test;
-    do
-        chmod 0755 $test
-        $test || exit $?
-    done
-    popd
-}
-
 uninstall() {
     list_of_installed_bins | xargs rm -vf
 }
@@ -134,9 +164,6 @@ case $1 in
     build|clean|dist|install|install_manpages|manpages|uninstall)
         $1
         ;;
-    test)
-        run_test
-        ;;
     *)
-        echo "usage: $(basename $0) build|clean|dist|install|test|uninstall" >&2
+        echo "usage: $(basename $0) build|clean|dist|install|uninstall" >&2
 esac