Move version to mkit.ini

mkit.ini

@@ -7,7 +7,8 @@
 
 [project]
 
-    name = Mkit
+    version = 0.0.8
+    name = MKit
     pkgname = mkit
     tagline = simple install helper
     relsrc = master
@@ -18,7 +19,6 @@
     group = bin
     group = rest
 
-    dist = config.mk
     dist = Makefile
     dist = mkit.ini
     dist = README.md

src/include/build.sh

@@ -95,7 +95,7 @@ dist() {
     local dirname=$MKIT_PROJ_PKGNAME-$version
     mkdir -p "$dirname"
     ini values "lists:dist" | xargs -I DIST_ITEM cp -R DIST_ITEM "$dirname"
-    sed -i -e "s/^VERSION = .*/VERSION = $version/" "$dirname/config.mk"
+    update_version "$version" "$dirname/mkit.ini"
     tar -cf "$dirname.tar" "$dirname"
     gzip -f "$dirname.tar"      # see above FIXME
     mkdir -p "$MKIT_LOCAL"
@@ -170,7 +170,7 @@ get_version() {
     # Build version string from available info using following
     # logic:
     #
-    #  1. use VERSION (from config.mk)
+    #  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
     #     (afer dash)
@@ -208,7 +208,7 @@ get_version() {
     # FIXME:  Using project:prerl for release IDs may not be compatible with
     #         release strategy implemented in release.sh
     #
-    local version=$VERSION
+    local version=$(ini 1value project:version)
     local prerl=$(ini 1value project:prerl)
     grep ":" <<<"$prerl" && warn "colon in project:prerl may corrupt version data: $prerl"
     if git rev-parse HEAD >&/dev/null;

src/include/mkit.sh

@@ -40,13 +40,9 @@ mkit_init() {
     #
     # Do basic initialization
     #
-    # Check for ini file, load variables from config.mk
+    # Check for ini file and some variables
     #
     test -f "$MKIT_INI" || die "cannot find mkit.ini: $MKIT_INI"
-    tmp=$(mktemp)
-    sed -e 's/ = /=/' < config.mk > "$tmp"
-    . "$tmp"
-    rm -f "$tmp"
     test -n "$(tr -d '[:space:]' <<<"$MKIT_LOCAL")" \
      || die "MKIT_LOCAL must be non-blank: '$MKIT_LOCAL'"
 }
@@ -66,6 +62,27 @@ warn() {
     echo "$@" >&2
 }
 
+update_version() {
+    #
+    # Change project.version in mkit.ini at path $2 to version $1
+    #
+    local version="$1"
+    local inifile="$2"
+    local tmp=$(mktemp -t mkit.update_version.XXXXXXXX)
+    <"$inifile" perl -e '
+        my $hit = 0;
+        my $done = 0;
+        foreach (<STDIN>) {
+            if      ($done) { print; next; }
+            elsif   (m/\[project\]/) { $hit++; print; next; }
+            elsif   (m/\[/) { $hit = 0; print; next; }
+            elsif   ($hit) { s/\bversion\b *=.*/version = $ARGV[0]/ and $done++; print; }
+            else { print; next; }
+        }
+    ' "$version" >"$tmp" || die "failed to update version in mkit.ini"
+    mv "$tmp" "$inifile"
+}
+
 route() {
     #
     # Call correct function based on $1

src/include/release.sh

@@ -29,8 +29,8 @@ __die_if() {
             ;;
         nobump)
             git diff-tree --no-commit-id --name-only -r HEAD \
-              | grep -qFx config.mk \
-             || die "last change must be version bump in config.mk"
+              | grep -qFx mkit.ini \
+             || die "last change must be version bump in mkit.ini"
             ;;
         wip)
             __git_info reldiff \
@@ -41,7 +41,7 @@ __die_if() {
             x=$(__ver_info nextver_g)
             __ver_info currver_c \
               | grep -qFx "$x" \
-             || die "new version not in config.mk: $x"
+             || die "new version not in mkit.ini: $x"
             ;;
     esac
 }
@@ -66,8 +66,7 @@ __ver_info() {
     case "$info" in
         lastver_g)  __git_info lasttag | sed s/^v// ;;
         nextver_g)  __make_ver "$level" "$(__ver_info lastver_g)" ;;
-        currver_c)  grep -m 1 -w VERSION config.mk \
-                     | sed 's/ *= */=/' | cut -d = -f 2 | xargs echo ;;
+        currver_c)  ini 1value project:version ;;
         nextver_c)  __make_ver "$level" "$(__ver_info currver_c)" ;;
     esac
 }
@@ -132,7 +131,7 @@ __git_msg_vbump() {
 
 __vbump() {
     local level="$1"
-    local lastver   # current from config.mk
+    local lastver   # current from mkit.ini
     local nextver   # after the bump
     __die_if nogit
     __die_if norelbr
@@ -141,10 +140,10 @@ __vbump() {
     nextver=$(__ver_info nextver_c)
     debug_var lastver nextver
     $MKIT_DRY && return
-    sed -i "s/$lastver/$nextver/" config.mk \
-      || die "failed to update config.mk"
-    git add config.mk \
-      || die "failed to add config.mk to the index"
+    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 "$(__git_msg_vbump)"
 }