Switch to in-line `do`/`then` style

Turns out to be concise and safe enough to become the preferred one.

notes/style.md

@@ -31,16 +31,14 @@ Indentation is done exclusively by *space*.
 
 Indentation level is *almost exclusively* 4 spaces.
 
-    for i in $(seq 1 5);
-    do
+    for i in $(seq 1 5); do
         something_with "$i"
     done
 
 One exception is *vertical pipelines*:
 
     cat list \
-      | while read line;
-        do
+      | while read line; do
             something_with "$line"
             ...
         done \
@@ -254,8 +252,7 @@ declarative line (the one ending with `{`):
         #
         local bar=$1    # barrator
         local baz       # bazate
-        for baz in "$@";
-        do
+        for baz in "$@"; do
             something_with "$bar" "$baz"
         done
     }
@@ -353,32 +350,28 @@ That is,
 
 ### `if`, `while`, `for` ###
 
-    if foo;
-    then
+    if foo; then
         bar
-    elif baz;
-    then
+    elif baz; then
         quux
     else
         idk
     fi
 
-    while foo;
-    do
+    while foo; do
         bar
         baz
         quux
     done
 
-    for foo in bar baz;
-    do
+    for foo in bar baz; do
         quux $foo
     done
 
 That is,
 
- *  `then`, `do` and `done` are always alone, aligned with opening keyword
-    (`if`, `while`, `for`) or intermediary keyword (`elif`, `else`);
+ *  `then` and `do` are always on same line as opening keyword (`if`,
+    `while`, `for`) or intermediary keyword (`elif`);
 
  *  command part (i.e. condition for `if`/`elif`/`while`, or expansion in
     `for`) is terminated by semicolon;

src/include-bash/inigrep.sh

@@ -129,8 +129,7 @@ _inigrep__fltkey() {
     local line      # every line
     local key       # key name part
     local value     # name part
-    while IFS= read -r line;                        # '  key  =  val  '
-    do
+    while IFS= read -r line; do                     # '  key  =  val  '
         line="${line##*([[:space:]])}"              # line='key  =  val  '
         key="${line%%*([[:space:]])=*}"             # key='key'
         value="${line##$key*([[:space:]])=}"        # value='  val  '
@@ -153,14 +152,12 @@ _inigrep__fltsct() {
     local line          # current line
     while IFS= read -r line;
     do
-        if [[ $line =~ ^[[:space:]]*\[[^]]*\].* ]];     # IOW: 'spaces[name]anything'
-        then
+        if [[ $line =~ ^[[:space:]]*\[[^]]*\].* ]]; then    # IOW: 'spaces[name]anything'
             # hack out only the name between '[' and ']'
             sct_name=$line
             sct_name=${sct_name##*([[:space:]])[}   # drop leading space
             sct_name=${sct_name%%]*}                # and trailing anything
-            if test "$sct_name" == "$WantedSection";
-            then
+            if test "$sct_name" == "$WantedSection"; then
                 sct_ok=true;                            # our section
                 $ListingMode && echos "[$sct_name]";    # inform lister
             else
@@ -183,8 +180,7 @@ _inigrep__fltlst() {
     local line=""           # current line
     local key="__NOKEY__"   # current key
     local sct="__NOSCT__"   # current section
-    while read -r line;
-    do
+    while read -r line; do
         case "$line" in
             \[*\]) sct=${line#[}; sct=${sct%]}; key=__NOKEY__   ;;
             *=*)   key="${line%%*([[:space:]])=*}" ;;   # key='key'
@@ -235,8 +231,7 @@ _inigrep__query() {
     #
     restore_shopt=$(shopt -p extglob)
     shopt -s extglob
-    for ifile in "$@";
-    do
+    for ifile in "$@"; do
         case "$ifile" in
             -) eval "$pipe" ;;
             *) <"$ifile" eval "$pipe" ;;
@@ -335,8 +330,7 @@ inigrep() {
     WantedSection="${kpath%.$WantedKey}"
     _inigrep__validate_ks || return 2
     debug -v WantedKey WantedSection
-    if $one_line;
-    then
+    if $one_line; then
         _inigrep__query "$@" | head -1
     else
         _inigrep__query "$@"

src/include-bash/pretty.sh

@@ -52,8 +52,7 @@ __shellfu_pretty__init() {
     #
     # Import proper submodule
     #
-    if shellfu try_import "_pretty_${PRETTY}";
-    then
+    if shellfu try_import "_pretty_${PRETTY}"; then
         shellfu import "_pretty_${PRETTY}"
         return 0
     else
@@ -86,8 +85,7 @@ debug_pipe() {
     #
     # Debug the whole pipe.
     #
-    while IFS= read -r line;
-    do
+    while IFS= read -r line; do
         debug "|$1: '$line'"
         echos "$line"
     done
@@ -160,8 +158,7 @@ mkusage() {
         *)                  break ;;
     esac done
     _pretty__echo -u "$@";
-    if test -n "$cmsg";
-    then
+    if test -n "$cmsg"; then
         test -n "$*" && echo >&2
         warn "bad usage: $cmsg"
     fi
@@ -245,8 +242,7 @@ _pretty__get_caller() {
     #
     local fname
     local nidx="${#FUNCNAME[@]}"
-    for fname in "${FUNCNAME[@]}";
-    do
+    for fname in "${FUNCNAME[@]}"; do
         (( nidx-- ))
         _pretty__is_internal && continue
         _pretty__is_frontend && continue
@@ -261,8 +257,7 @@ _pretty__get_frontend() {
     # Get entry point function name from stack
     #
     local fname
-    for fname in "${FUNCNAME[@]}";
-    do
+    for fname in "${FUNCNAME[@]}"; do
         _pretty__is_internal && continue
         _pretty__is_frontend && echos "$fname" && return 0
         echo "do not call _pretty_* directly: $fname" >&2
@@ -287,15 +282,13 @@ _pretty__is_excluded() {
         *__*)   qualified=true  ;;
         *)      qualified=false ;;
     esac
-    if $qualified;
-    then
+    if $qualified; then
         # we'll use only the module part of the name
         name=${name#_}      # drop one "internal" prefix
         name=${name#_}      # drop yet another one
         name=${name%%__*}   # drop funcname
     fi
-    for listed in ${PRETTY_DEBUG_EXCLUDE//,/ };
-    do
+    for listed in ${PRETTY_DEBUG_EXCLUDE//,/ }; do
         test "$name" = "$listed" && return 0
     done
     return 1
@@ -398,13 +391,10 @@ _pretty__echo_files() {
     # Print names and contents of existing files
     #
     local fp
-    for fp in "$@";
-    do
-        if test "$fp" = "-";
-        then
+    for fp in "$@"; do
+        if test "$fp" = "-"; then
             cat
-        elif test -s "$fp" || test "$fp" = "/dev/stdin";
-        then
+        elif test -s "$fp" || test "$fp" = "/dev/stdin"; then
             echo "-- $fp --"
             cat "$fp"
         fi
@@ -428,8 +418,7 @@ _pretty__echo_trace() {
     $PRETTY_DEBUG || return 0
     local depth
     echo "== trace =="
-    for depth in $(seq 0 ${#FUNCNAME});
-    do
+    for depth in $(seq 0 ${#FUNCNAME}); do
         caller "$depth" || break
     done \
       | tail -n +3 \
@@ -498,8 +487,7 @@ _pretty__echo_usage() {
         1)  echo "usage: $self $1"; return 0 ;;
     esac
     echo usage:
-    for arg in "$@";
-    do
+    for arg in "$@"; do
         case $esc:$arg in
             0:--) shift; mode=plain;  esc=1; echo                ;;
             0:-c) shift; mode=indent; esc=1; echo; echo commands: ;;
@@ -524,15 +512,12 @@ _pretty__echo_vars() {
     #
     local varname
     local declare_str
-    for varname in "$@";
-    do
-        if ! _pretty__is_word "$varname";
-        then
+    for varname in "$@"; do
+        if ! _pretty__is_word "$varname"; then
             warn "unsafe value skipped: $varname";
             continue
         fi
-        if declare_str=$(declare -p "$varname" 2>/dev/null);
-        then
+        if declare_str=$(declare -p "$varname" 2>/dev/null); then
             _pretty__echo "${declare_str#declare ?? }"
         else
             _pretty__echo "$varname #Unset"

src/include-bash/sfdoc.sh

@@ -130,8 +130,7 @@ __sfdoc__export_as_markdown() {
     echo
     __sfdoc__get_doc | __sfdoc__md_escapes
     echo
-    for variable in $(sfdoc__ls v "$MPath" | cut -d: -f2);
-    do
+    for variable in $(sfdoc__ls v "$MPath" | cut -d: -f2); do
         debug -v variable
         $vheader_done || {
             echo
@@ -145,8 +144,7 @@ __sfdoc__export_as_markdown() {
         __sfdoc__get_doc "v:$variable" | __sfdoc__md_escapes
         echo
     done
-    for function in $(sfdoc__ls f "$MPath" | cut -d: -f2);
-    do
+    for function in $(sfdoc__ls f "$MPath" | cut -d: -f2); do
         debug -v function
         $fheader_done || {
             echo
@@ -184,8 +182,7 @@ __sfdoc__export_as_pod() {
     echo
     __sfdoc__get_doc
     echo
-    for variable in $(sfdoc__ls v "$MPath" | cut -d: -f2);
-    do
+    for variable in $(sfdoc__ls v "$MPath" | cut -d: -f2); do
         debug -v variable
         $vheader_done || {
             echo
@@ -206,8 +203,7 @@ __sfdoc__export_as_pod() {
         echo "=back"
         echo
     }
-    for function in $(sfdoc__ls f "$MPath" | cut -d: -f2);
-    do
+    for function in $(sfdoc__ls f "$MPath" | cut -d: -f2); do
         debug -v function
         $fheader_done || {
             echo
@@ -451,8 +447,7 @@ __sfdoc__filter_var() {
     cache=$(mktemp -t shellfu_doc.__sfdoc__filter_var.XXXXXXXX)
     state=junk
     o_end=false
-    while read -r line;
-    do
+    while read -r line; do
         case $state:$line in
             # looks like void
             void:)          state=void; o_end=false ;;
@@ -490,10 +485,8 @@ __sfdoc__filter_var() {
         case $state in
             edge|dstr|vstr) echo "$line" >> "$cache" ;;
         esac
-        if $o_end;
-        then
-            if grep -q "^$oname=" "$cache";   # it's our wanted object
-            then
+        if $o_end; then
+            if grep -q "^$oname=" "$cache"; then    # it's our wanted object
                 cat "$cache"
                 rm "$cache"
                 return 0

src/include-bash/sfpi.sh

@@ -188,8 +188,7 @@ sfpi__key() {
     local key=$2    # meta-data key
     local value     # ^^ value
     local fun="${SFPI__PREFIX}_${plg}__sfpimeta" # plg getter function name
-    if type -t "$fun" >/dev/null;
-    then
+    if type -t "$fun" >/dev/null; then
         value=$("$fun" "$key")
         debug -v fun key value
         test -n "$value" || value="(none)"

src/include-sh/mdfmt.sh

@@ -78,8 +78,7 @@ _mdfmt__indent() {
     test "$Elem" == h2 && { cat; return; }
     test "$Elem" == h3 && { cat; return; }
     pfx=$(
-        for n in $(seq 1 "$Nest");
-        do
+        for n in $(seq 1 "$Nest"); do
             printf '    '
         done
     )

src/shellfu.sh.skel

@@ -139,22 +139,19 @@ shellfu() {
     case $cmd in
         __debug)
             $SHELLFU_DEBUGINIT || return 0
-            for msg in "$@";
-            do
+            for msg in "$@"; do
                 echo "shellfu:debug: $msg" >&2
             done
             ;;
         __die)
-            for msg in "$@";
-            do
+            for msg in "$@"; do
                 echo "shellfu:fatal: $msg" >&2
             done
             test -z "$PS1" && exit 3
             return 3
             ;;
         __warn)
-            for msg in "$@";
-            do
+            for msg in "$@"; do
                 echo "shellfu: $msg" >&2
             done
             ;;
@@ -170,8 +167,7 @@ shellfu() {
             #
             local mname=$1
             shellfu _is_imported "$mname" && return 0
-            if shellfu _do_import "$mname";
-            then
+            if shellfu _do_import "$mname"; then
                 __SHELLFU_IMPORTED="$__SHELLFU_IMPORTED${__SHELLFU_IMPORTED:+:}$mname"
             else
                 shellfu __die "cannot import module: $mname"
@@ -222,8 +218,7 @@ shellfu() {
             es=$?
             test -n "$SHELLFU_EMBEDTMP" && echo "$mpath" >> "$SHELLFU_EMBEDTMP"
             local init=__shellfu_${mname}__init
-            if test "$(command -v "$init")" = "$init";
-            then
+            if test "$(command -v "$init")" = "$init"; then
                 shellfu __debug "launching init function: $init"
                 $init
                 es=$?
@@ -247,8 +242,7 @@ shellfu() {
             echo "$SHELLFU_PATH:$SHELLFU_INCLUDE-sh:$SHELLFU_INCLUDE-$SHELLFU_COMPAT" \
               | tr ":" '\n' \
               | awk '!seen[$0]++' \
-              | while read -r incdir;
-                do
+              | while read -r incdir; do
                     shellfu __debug "checking: $incdir"
                     test -d "$incdir" || continue
                     shellfu __debug "looking into: $incdir"