Naming convention: Sort functions aplhabetically

src/include/build.sh

@@ -3,18 +3,6 @@
 . "$MKIT_DIR/include/ini.sh" || die "cannot import ini.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
@@ -30,6 +18,73 @@ _build1() {
     echo "$dstpath" >> "$MKIT_LOCAL/built.lst"
 }
 
+_build1_ftype() {
+    #
+    # Build a file of type $1
+    #
+    local ftype="$1"
+    case $ftype in
+        MKIT_COMMON)    _expand_variables "vars" ;;
+        markdown)       _expand_includes | _expand_variables "vars" ;;
+        rpmstuff)       _expand_variables "vars" "rpmstuff:vars" ;;
+        *)              die "unknown file type: $ftype" ;;
+    esac
+}
+
+_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 variables from sections $@
+    #
+    local script=$(mktemp --tmpdir mkit-tmp.XXXXXXXXXX)
+    local section varname varvalue
+    {
+        for section in "$@";
+        do
+            debug_var section
+            ini lskeys "$section" \
+              | while read varname;
+                do
+                    varvalue="$(ini 1value "$section:$varname" | sed -e 's/\$/\\$/' )"
+                    echo "s|$varname|$varvalue|g;"
+                    debug_var varname varvalue
+                done
+        done
+        echo "s|__MKIT_PROJ_NAME__|$(ini 1value project:name)|g;"
+        echo "s|__MKIT_PROJ_CODENAME__|$(ini 1value project:codename)|g;"
+        echo "s|__MKIT_PROJ_PKGNAME__|$(ini 1value project:pkgname)|g;"
+        echo "s|__MKIT_PROJ_TAGLINE__|$(ini 1value project:tagline)|g;"
+        echo "s|__MKIT_PROJ_VERSION__|$(get_version)|g;"
+        echo "s|__MKIT_SELF_VERSION__|$MKIT_VERSION|g;"
+    } >> "$script"
+    perl -wp "$script" || die "_expand_variables failed"
+    rm "$script"
+}
+
 _guess_ftype() {
     #
     # Guess file type from destination path $1
@@ -41,17 +96,17 @@ _guess_ftype() {
     esac
 }
 
-_build1_ftype() {
+
+build() {
     #
-    # Build a file of type $1
+    # Add meat to all skeletons
     #
-    local ftype="$1"
-    case $ftype in
-        MKIT_COMMON)    _expand_variables "vars" ;;
-        markdown)       _expand_includes | _expand_variables "vars" ;;
-        rpmstuff)       _expand_variables "vars" "rpmstuff:vars" ;;
-        *)              die "unknown file type: $ftype" ;;
-    esac
+    local srcpath
+    find src -type f -name '*.skel' \
+     | while read srcpath;
+       do
+           _build1 "$srcpath"
+       done
 }
 
 build_manpages() {
@@ -85,25 +140,6 @@ clean() {
     true
 }
 
-dist() {
-    #
-    # Create distributable tarball
-    #
-    #FIXME: lacking Makefile skills, we do this step twice fot
-    #       rpmstuff, hence -f hack for gzip
-    #
-    local version=$(get_version)
-    local dirname=$MKIT_PROJ_PKGNAME-$version
-    mkdir -p "$dirname"
-    ini values "lists:dist" | xargs -I DIST_ITEM cp -R DIST_ITEM "$dirname"
-    update_version "$version" "$dirname/mkit.ini"
-    tar -cf "$dirname.tar" "$dirname"
-    gzip -f "$dirname.tar"      # see above FIXME
-    mkdir -p "$MKIT_LOCAL"
-    echo "$dirname.tar.gz" >> "$MKIT_LOCAL/built.lst"
-    rm -rf "$dirname"
-}
-
 debstuff() {
     #
     # Build Debian stuff (eamed tarball, debian dir)
@@ -134,69 +170,23 @@ debstuff() {
     echo debian >> "$MKIT_LOCAL/built.lst"
 }
 
-rpmstuff() {
-    #
-    # Build specfile
-    #
-    local specname="$MKIT_PROJ_PKGNAME.spec"
-    local specsrc="$(ini 1value "rpmstuff:spec_skel")"
-    test -n "$specsrc" || die "rpmstuff:spec_skel not specified"
-    test -f "$specsrc" || die "specfile template not found: $specsrc"
-    _build1 "$specsrc" "$specname"
-}
-
-_expand_includes() {
-    #
-    # Expand include directives
-    #
-    # Expand e.g. `<!-- include4: foo.sh -->` to include code of foo.sh
+dist() {
     #
-    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() {
+    # Create distributable tarball
     #
-    # Expand variables from sections $@
+    #FIXME: lacking Makefile skills, we do this step twice fot
+    #       rpmstuff, hence -f hack for gzip
     #
-    local script=$(mktemp --tmpdir mkit-tmp.XXXXXXXXXX)
-    local section varname varvalue
-    {
-        for section in "$@";
-        do
-            debug_var section
-            ini lskeys "$section" \
-              | while read varname;
-                do
-                    varvalue="$(ini 1value "$section:$varname" | sed -e 's/\$/\\$/' )"
-                    echo "s|$varname|$varvalue|g;"
-                    debug_var varname varvalue
-                done
-        done
-        echo "s|__MKIT_PROJ_NAME__|$(ini 1value project:name)|g;"
-        echo "s|__MKIT_PROJ_CODENAME__|$(ini 1value project:codename)|g;"
-        echo "s|__MKIT_PROJ_PKGNAME__|$(ini 1value project:pkgname)|g;"
-        echo "s|__MKIT_PROJ_TAGLINE__|$(ini 1value project:tagline)|g;"
-        echo "s|__MKIT_PROJ_VERSION__|$(get_version)|g;"
-        echo "s|__MKIT_SELF_VERSION__|$MKIT_VERSION|g;"
-    } >> "$script"
-    perl -wp "$script" || die "_expand_variables failed"
-    rm "$script"
+    local version=$(get_version)
+    local dirname=$MKIT_PROJ_PKGNAME-$version
+    mkdir -p "$dirname"
+    ini values "lists:dist" | xargs -I DIST_ITEM cp -R DIST_ITEM "$dirname"
+    update_version "$version" "$dirname/mkit.ini"
+    tar -cf "$dirname.tar" "$dirname"
+    gzip -f "$dirname.tar"      # see above FIXME
+    mkdir -p "$MKIT_LOCAL"
+    echo "$dirname.tar.gz" >> "$MKIT_LOCAL/built.lst"
+    rm -rf "$dirname"
 }
 
 get_version() {
@@ -280,3 +270,14 @@ get_version() {
     fi
     echo "$version"
 }
+
+rpmstuff() {
+    #
+    # Build specfile
+    #
+    local specname="$MKIT_PROJ_PKGNAME.spec"
+    local specsrc="$(ini 1value "rpmstuff:spec_skel")"
+    test -n "$specsrc" || die "rpmstuff:spec_skel not specified"
+    test -f "$specsrc" || die "specfile template not found: $specsrc"
+    _build1 "$specsrc" "$specname"
+}

src/include/deploy.sh

@@ -1,19 +1,5 @@
 #!/bin/bash
 
-_maybe() {
-    #
-    # Call the deploy command $1 $@ unless in dry mode
-    #
-    debug "$@"
-    local cmd="$1"; shift
-    $MKIT_DRY && return
-    case "$cmd" in
-        cp|rm|rmdir|chmod|mkdir) $cmd "$@" ;;
-        install)                 command -p install "$@" ;;
-        *)                       die "bad command called";;
-    esac
-}
-
 _deploy_item() {
     #
     # Deploy item and make it look like wanted
@@ -78,6 +64,20 @@ _get_root() {
     esac
 }
 
+_maybe() {
+    #
+    # Call the deploy command $1 $@ unless in dry mode
+    #
+    debug "$@"
+    local cmd="$1"; shift
+    $MKIT_DRY && return
+    case "$cmd" in
+        cp|rm|rmdir|chmod|mkdir) $cmd "$@" ;;
+        install)                 command -p install "$@" ;;
+        *)                       die "bad command called";;
+    esac
+}
+
 install() {
     #
     # Install product

src/include/ini.sh

@@ -1,24 +1,5 @@
 #!/bin/bash
 
-ini() {
-    #
-    # do ini operation
-    #
-    local op=$1
-    local arg=$2
-    local fn
-    local limit=_ini_cat
-    debug_var op arg
-    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
-    <"$MKIT_INI" $fn "$arg" | $limit
-}
-
 _ini_cat() {
     #
     # A no-op for text stream
@@ -121,3 +102,22 @@ _ini_maybe_expand() {
         _ini_cat
     fi
 }
+
+ini() {
+    #
+    # do ini operation
+    #
+    local op=$1
+    local arg=$2
+    local fn
+    local limit=_ini_cat
+    debug_var op arg
+    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
+    <"$MKIT_INI" $fn "$arg" | $limit
+}

src/include/mkit.sh

@@ -5,6 +5,31 @@
 . "$MKIT_DIR/include/release.sh" || die "cannot import release.sh"
 . "$MKIT_DIR/include/ini.sh"    || die "cannot import ini.sh"
 
+MKIT_INI=${MKIT_INI:-mkit.ini}
+MKIT_INI_EXPAND=2
+MKIT_PROJ_PKGNAME=""
+MKIT_DEFAULT_MODE="644"
+
+_valid_targets() {
+    #
+    # List valid routes
+    #
+    echo build
+    echo build_manpages
+    echo clean
+    echo debstuff
+    echo dist
+    echo install
+    echo release_x
+    echo release_y
+    echo release_z
+    echo rpmstuff
+    echo uninstall
+    echo vbump_x
+    echo vbump_y
+    echo vbump_z
+}
+
 debug() {
     #
     # Print debug message
@@ -30,10 +55,13 @@ debug_var() {
     done
 }
 
-MKIT_INI=${MKIT_INI:-mkit.ini}
-MKIT_INI_EXPAND=2
-MKIT_PROJ_PKGNAME=""
-MKIT_DEFAULT_MODE="644"
+die() {
+    #
+    # Exit with message and non-zero exit status
+    #
+    echo "fatal: $*" >&2
+    exit 4
+}
 
 mkit_init() {
     #
@@ -47,19 +75,21 @@ mkit_init() {
      || die "MKIT_LOCAL must be non-blank: '$MKIT_LOCAL'"
 }
 
-die() {
-    #
-    # Exit with message and non-zero exit status
-    #
-    echo "fatal: $*" >&2
-    exit 4
-}
-
-warn() {
+route() {
     #
-    # Print warning message
+    # Call correct function based on $1
     #
-    echo "$@" >&2
+    if _valid_targets | grep -qwx "^$1";
+    then
+        "$1"
+    else
+        {
+            echo "usage: $(basename "$0") TARGET"
+            echo
+            echo "valid targets:"
+            _valid_targets | sed 's/^/    /'
+        } >&2
+    fi
 }
 
 update_version() {
@@ -83,39 +113,9 @@ update_version() {
     mv "$tmp" "$inifile"
 }
 
-route() {
-    #
-    # Call correct function based on $1
-    #
-    if _valid_targets | grep -qwx "^$1";
-    then
-        "$1"
-    else
-        {
-            echo "usage: $(basename "$0") TARGET"
-            echo
-            echo "valid targets:"
-            _valid_targets | sed 's/^/    /'
-        } >&2
-    fi
-}
-
-_valid_targets() {
+warn() {
     #
-    # List valid routes
+    # Print warning message
     #
-    echo build
-    echo build_manpages
-    echo clean
-    echo debstuff
-    echo dist
-    echo install
-    echo release_x
-    echo release_y
-    echo release_z
-    echo rpmstuff
-    echo uninstall
-    echo vbump_x
-    echo vbump_y
-    echo vbump_z
+    echo "$@" >&2
 }

src/include/release.sh

@@ -58,17 +58,17 @@ _git_info() {
     esac
 }
 
-_ver_info() {
-    #
-    # Get git info $1
-    #
-    local info="$1"
-    case "$info" in
-        lastver_g)  _git_info lasttag | sed s/^v// ;;
-        nextver_g)  _make_ver "$level" "$(_ver_info lastver_g)" ;;
-        currver_c)  ini 1value project:version ;;
-        nextver_c)  _make_ver "$level" "$(_ver_info currver_c)" ;;
-    esac
+_git_msg_vbump() {
+    echo "Bump version"
+    echo ""
+    echo "Overview of changes:"
+    echo ""
+    _git_info reldiff \
+      | sed '
+            s/^[a-f0-9]\{7\} / *  &/; t PATHS
+            s/^/        /
+            :PATHS
+        '
 }
 
 _make_ver() {
@@ -116,19 +116,6 @@ _release() {
     git branch -f "$(ini 1value project:reldst)" "$newtag"
 }
 
-_git_msg_vbump() {
-    echo "Bump version"
-    echo ""
-    echo "Overview of changes:"
-    echo ""
-    _git_info reldiff \
-      | sed '
-            s/^[a-f0-9]\{7\} / *  &/; t PATHS
-            s/^/        /
-            :PATHS
-        '
-}
-
 _vbump() {
     local level="$1"
     local lastver   # current from mkit.ini
@@ -147,16 +134,17 @@ _vbump() {
     git commit -e -m "$(_git_msg_vbump)"
 }
 
-vbump_x() {
-    _vbump x
-}
-
-vbump_y() {
-    _vbump y
-}
-
-vbump_z() {
-    _vbump z
+_ver_info() {
+    #
+    # Get git info $1
+    #
+    local info="$1"
+    case "$info" in
+        lastver_g)  _git_info lasttag | sed s/^v// ;;
+        nextver_g)  _make_ver "$level" "$(_ver_info lastver_g)" ;;
+        currver_c)  ini 1value project:version ;;
+        nextver_c)  _make_ver "$level" "$(_ver_info currver_c)" ;;
+    esac
 }
 
 release_x() {
@@ -170,3 +158,15 @@ release_y() {
 release_z() {
     _release z
 }
+
+vbump_x() {
+    _vbump x
+}
+
+vbump_y() {
+    _vbump y
+}
+
+vbump_z() {
+    _vbump z
+}