Use more compact `do`/`then` form

Drop the unnecessary and space-wasting requirement that `do` and `then`
must be alone on line.  It's a thing of the past!

src/include/build.sh

@@ -68,12 +68,10 @@ _expand_tokens() {
     local varvalue      # each token value
     script=$(mktemp --tmpdir mkit-tmp.XXXXXXXXXX)
     {
-        for section in "$@";
-        do
+        for section in "$@"; do
             debug_var section
             ini lskeys "$section" \
-              | while read -r varname;
-                do
+              | while read -r varname; do
                     varvalue="$(ini 1value "$section:$varname" | _qfs )"
                     echo "s|$varname|$varvalue|g;"
                     debug_var varname varvalue
@@ -120,8 +118,7 @@ build() {
     #
     local srcpath   # each source path
     find -type f -name '*.skel' \
-     | while read -r srcpath;
-       do
+     | while read -r srcpath; do
            _build1 "$srcpath"
        done
 }
@@ -132,11 +129,9 @@ build_manpages() {
     #
     local manfile   # each manual file listed in '[files:man]'
     local mdfile    # each source markdown file
-    if command -v ronn >/dev/null;
-    then
+    if command -v ronn >/dev/null; then
         ini lskeys "files:man" \
-          | while read -r manfile;
-            do
+          | while read -r manfile; do
                 mdfile="$manfile.md"
                 ronn -r "$mdfile"
                 mkdir -p "$MKIT_LOCAL"
@@ -185,8 +180,7 @@ debstuff() {
     test -d "$debian_skel" || die "debian directory template found: $debian_skel"
     mkdir -p debian/source
     find "$debian_skel" -type f \
-      | while read -r dfsrc;
-        do
+      | while read -r dfsrc; do
             dftgt="debian/${dfsrc#$debian_skel}"
             mkdir -p "$(dirname "$dftgt")"
             _build1 "$dfsrc" "$dftgt" debstuff

src/include/deploy.sh

@@ -27,13 +27,11 @@ _deploy_item() {
     local dst=$2                            # destination path
     local mode=${3:-$MKIT_DEFAULT_MODE}     # mode
     local chmod_item                        # each file to chmod in directory
-    if test -d "$src";
-    then
+    if test -d "$src"; then
         _maybe mkdir -vp "$(dirname "$dst")"
         _maybe cp -Tvr "$src" "$dst"
         find "$dst" -type f \
-          | while read -r chmod_item;
-            do
+          | while read -r chmod_item; do
                 _maybe chmod "$mode" "$chmod_item"
             done
     else
@@ -94,12 +92,10 @@ install() {
     ini lskeys "files" \
       | sort \
       | uniq \
-      | while read -r group;
-        do
+      | while read -r group; do
             mode=$(ini 1value "modes:$group")
             ini values "files:$group" \
-              | while read -r src dst;
-                do
+              | while read -r src dst; do
                     dst=$(_get_dst "$group" "$src" "$dst")
                     _deploy_item "$src" "$dst" "$mode"
                 done
@@ -118,11 +114,9 @@ uninstall() {
     ini lskeys "files" \
       | sort \
       | uniq \
-      | while read -r group;
-        do
+      | while read -r group; do
             ini values "files:$group" \
-              | while read -r src dst;
-                do
+              | while read -r src dst; do
                     dst=$(_get_dst "$group" "$src" "$dst")
                     _maybe rm -vrf "$dst"
                 done

src/include/facts.sh

@@ -89,8 +89,7 @@ git_lasthash() {
     # target, but that's actually expected.)
     #
     local last_hash     # last commit hash
-    if git_present;
-    then    # we are in git repo
+    if git_present; then    # we are in git repo
         last_hash=$(git rev-parse HEAD)
         echo -n "$last_hash"
         git_bool dirty && echo -n ".dirty"

src/include/ini.sh

@@ -5,8 +5,7 @@ _ini_cat() {
     # A no-op for text stream
     #
     local line      # each line
-    while read -r line;
-    do
+    while read -r line; do
         printf -- "%s\n" "$line"
     done
 }
@@ -19,8 +18,7 @@ _ini_expand() {
     local suffix    # tail of the line
     local ref       # reference
     local value     # value if reference
-    while read -r line;                     # [foo:bar]/path
-    do
+    while read -r line; do                  # [foo:bar]/path
         suffix="${line#\[*\]}"              # /path
         ref="${line%$suffix}"               # [foo:bar]
         ref="${ref%\]}"                     # [foo:bar
@@ -56,14 +54,11 @@ _ini_greppath() {
     local wntkey=${wnt##*:}         # ^^ key part
     local wntsec=${wnt%:$wntkey}    # ^^ section part
     local override                  # ENV override (only ENV section)
-    if test "$wntsec" = 'ENV';
-    then
+    if test "$wntsec" = 'ENV'; then
         override=${!wntkey}
-        if test -n "$override";
-        then
-            echo "$override"
-            return
-        fi
+        test -n "$override" \
+         && echo "$override" \
+         && return
     fi
     _ini_grepsec "$wntsec" | _ini_grepkey "$wntkey"
 }
@@ -77,8 +72,7 @@ _ini_grepsec() {
     local line          # each input line
     grep '.' \
       | grep -v '\s*#' \
-      | while read -r line;
-        do
+      | while read -r line; do
             case "$line" in
                 \[$wnt\]) ok=true;  continue ;;
                 \[*\])    ok=false; continue ;;
@@ -101,8 +95,7 @@ _ini_maybe_expand() {
     #
     # Decide whether or not to expand
     #
-    if test "$MKIT_INI_EXPAND" -gt 0;
-    then
+    if test "$MKIT_INI_EXPAND" -gt 0; then
         MKIT_INI_EXPAND=$(( --MKIT_INI_EXPAND )) _ini_expand
     else
         _ini_cat

src/include/mkit.sh

@@ -39,8 +39,7 @@ debug_var() {
     #
     $MKIT_DEBUG || return 0
     local __mkit_debug_var_name__       # variable name to debug
-    for __mkit_debug_var_name__ in "$@";
-    do
+    for __mkit_debug_var_name__ in "$@"; do
         {
             echo -n "MKIT_DEBUG: ${FUNCNAME[1]}():"
             echo -n " $__mkit_debug_var_name__"
@@ -125,8 +124,7 @@ route() {
     #
     # Call correct function based on $1
     #
-    if _valid_targets | grep -qwx "^$1";
-    then
+    if _valid_targets | grep -qwx "^$1"; then
         "$1"
     else
         {

src/include/release.sh

@@ -107,8 +107,7 @@ _release() {
 
     reldst=$(ini 1value project:reldst)
     debug_var reldst
-    if test -n "$reldst";
-    then
+    if test -n "$reldst"; then
         git branch -f "$reldst" "$newtag"
     fi
 }