Naming convention: Prefix internal functions with _

src/include/build.sh

     find src -type f -name '*.skel' \
      | while read srcpath;
        do
-           build1 "$srcpath"
+           _build1 "$srcpath"
        done
 }
 
-build1() {
+_build1() {
     #
     # Process one skeleton
     #
     local dstpath="$2"
     local ftype="$3"
     test -n "$dstpath"  || dstpath=${srcpath%.skel}
-    test -n "$ftype"    || ftype=$(guess_ftype "$dstpath")
+    test -n "$ftype"    || ftype=$(_guess_ftype "$dstpath")
     debug_var srcpath dstpath ftype
-    <"$srcpath" build1_ftype "$ftype" >"$dstpath"
+    <"$srcpath" _build1_ftype "$ftype" >"$dstpath"
     mkdir -p "$MKIT_LOCAL"
     echo "$dstpath" >> "$MKIT_LOCAL/built.lst"
 }
 
-guess_ftype() {
+_guess_ftype() {
     #
     # Guess file type from destination path $1
     #
     esac
 }
 
-build1_ftype() {
+_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" ;;
+        MKIT_COMMON)    _expand_variables "vars" ;;
+        markdown)       _expand_includes | _expand_variables "vars" ;;
+        rpmstuff)       _expand_variables "vars" "rpmstuff:vars" ;;
         *)              die "unknown file type: $ftype" ;;
     esac
 }
         do
             dftgt="debian/${dfsrc#$debian_skel}"
             mkdir -p "$(dirname "$dftgt")"
-            build1 "$dfsrc" "$dftgt"
+            _build1 "$dfsrc" "$dftgt"
         done
     echo debian >> "$MKIT_LOCAL/built.lst"
 }
     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"
+    _build1 "$specsrc" "$specname"
 }
 
-expand_includes() {
+_expand_includes() {
     #
     # Expand include directives
     #
     '
 }
 
-expand_variables() {
+_expand_variables() {
     #
     # Expand variables from sections $@
     #
         echo "s|__MKIT_PROJ_VERSION__|$(get_version)|g;"
         echo "s|__MKIT_SELF_VERSION__|$MKIT_VERSION|g;"
     } >> "$script"
-    perl -wp "$script" || die "expand_variables failed"
+    perl -wp "$script" || die "_expand_variables failed"
     rm "$script"
 }
 

src/include/deploy.sh

     esac
 }
 
-deploy_item() {
+_deploy_item() {
     #
     # Deploy item and make it look like wanted
     #
-    # usage: deploy_item src dst [mode]
+    # usage: _deploy_item src dst [mode]
     #
     # Both src and dst must be names of actual items[1],
     # whereas dst must not exist.  On update, dst is
     fi
 }
 
-get_dst() {
+_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")"
+    echo "$(_get_root "$grp")/$(ini 1value "files:$grp:$src")"
 }
 
-get_root() {
+_get_root() {
     #
     # Find out target rooot for group $1
     #
             ini lskeys "files:$group" \
               | while read src;
                 do
-                    dst=$(get_dst "$group" "$src")
-                    deploy_item "$src" "$dst" "$mode"
+                    dst=$(_get_dst "$group" "$src")
+                    _deploy_item "$src" "$dst" "$mode"
                 done
         done
     test -f "$MKIT_LOCAL/autoclean" && clean
             ini lskeys "files:$group" \
               | while read src;
                 do
-                    dst=$(get_dst "$group" "$src")
+                    dst=$(_get_dst "$group" "$src")
                     _maybe rm -vrf "$dst"
                 done
         done

src/include/mkit.sh

     #
     # Call correct function based on $1
     #
-    if valid_targets | grep -qwx "^$1";
+    if _valid_targets | grep -qwx "^$1";
     then
         "$1"
     else
             echo "usage: $(basename "$0") TARGET"
             echo
             echo "valid targets:"
-            valid_targets | sed 's/^/    /'
+            _valid_targets | sed 's/^/    /'
         } >&2
     fi
 }
 
-valid_targets() {
+_valid_targets() {
     #
     # List valid routes
     #

src/include/release.sh

 #!/bin/bash
 
-__die_if() {
+_die_if() {
     #
     # Die if blocking condition $1 is detected
     #
             ;;
         norelbr)
             local relsrc=$(ini 1value project:relsrc)
-            __git_info curbranch \
+            _git_info curbranch \
               | grep -qFx "$relsrc" \
              || die "you are not on release source branch: $relsrc"
             ;;
              && die "tree is dirty: $dirt"
             ;;
         novertag)
-            __git_info lasttag \
+            _git_info lasttag \
               | grep -q . \
              || die "cannot find last tag"
             ;;
              || die "last change must be version bump in mkit.ini"
             ;;
         wip)
-            __git_info reldiff \
+            _git_info reldiff \
               | grep '^....... WIP ' \
-             && die "WIP commit since $(__git_info lasttag)"
+             && die "WIP commit since $(_git_info lasttag)"
             ;;
         old_c)
-            x=$(__ver_info nextver_g)
-            __ver_info currver_c \
+            x=$(_ver_info nextver_g)
+            _ver_info currver_c \
               | grep -qFx "$x" \
              || die "new version not in mkit.ini: $x"
             ;;
     esac
 }
 
-__git_info() {
+_git_info() {
     #
     # Get git info $1
     #
     case "$info" in
         lasttag)    git tag | grep ^v | sort -V | tail -n1  ;;
         curbranch)  git rev-parse --abbrev-ref HEAD         ;;
-        reldiff)    git log --oneline "$(__git_info lasttag)..HEAD" --name-only ;;
+        reldiff)    git log --oneline "$(_git_info lasttag)..HEAD" --name-only ;;
     esac
 }
 
-__ver_info() {
+_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)" ;;
+        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)" ;;
+        nextver_c)  _make_ver "$level" "$(_ver_info currver_c)" ;;
     esac
 }
 
-__make_ver() {
+_make_ver() {
     local level=$1
     local old=$2
     local oldx=${old%.*.*}
     echo "$new"
 }
 
-__release() {
+_release() {
     #
     # Prepare release
     #
     local level=$1
     local newtag
 
-    __die_if nogit
-    __die_if norelbr
-    __die_if dirty
-    __die_if novertag
-    __die_if nobump
-    __die_if wip
-    __die_if old_c
+    _die_if nogit
+    _die_if norelbr
+    _die_if dirty
+    _die_if novertag
+    _die_if nobump
+    _die_if wip
+    _die_if old_c
 
-    newtag=v$(__ver_info nextver_g)
+    newtag=v$(_ver_info nextver_g)
     set -e
     debug_var newtag
     $MKIT_DRY && return
     git branch -f "$(ini 1value project:reldst)" "$newtag"
 }
 
-__git_msg_vbump() {
+_git_msg_vbump() {
     echo "Bump version"
     echo ""
     echo "Overview of changes:"
     echo ""
-    __git_info reldiff \
+    _git_info reldiff \
       | sed '
             s/^[a-f0-9]\{7\} / *  &/; t PATHS
             s/^/        /
         '
 }
 
-__vbump() {
+_vbump() {
     local level="$1"
     local lastver   # current from mkit.ini
     local nextver   # after the bump
-    __die_if nogit
-    __die_if norelbr
-    __die_if dirty
-    lastver=$(__ver_info currver_c)
-    nextver=$(__ver_info nextver_c)
+    _die_if nogit
+    _die_if norelbr
+    _die_if dirty
+    lastver=$(_ver_info currver_c)
+    nextver=$(_ver_info nextver_c)
     debug_var lastver nextver
     $MKIT_DRY && return
     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)"
+    git commit -e -m "$(_git_msg_vbump)"
 }
 
 vbump_x() {
-    __vbump x
+    _vbump x
 }
 
 vbump_y() {
-    __vbump y
+    _vbump y
 }
 
 vbump_z() {
-    __vbump z
+    _vbump z
 }
 
 release_x() {
-    __release x
+    _release x
 }
 
 release_y() {
-    __release y
+    _release y
 }
 
 release_z() {
-    __release z
+    _release z
 }