Hack completion code together to simplify updates

src/complete.bash

@@ -1,12 +1,15 @@
 #!/bin/bash
 
-__satcmd() {
+__SATURNIN_COMPLETE_CMDNAME=satcmd
+
+#shellcheck disable=SC2016
+__SATURNIN_COMPLETE_CODETMPL='
+__%s() {
     local cur opts sopts
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
     sopts="-d -h -v"
     opts="--help --verbose --debug --version --version-semver"
-
     case "$cur" in
         -*)
             COMPREPLY=(
@@ -20,9 +23,16 @@ __satcmd() {
             ;;
         *)
             COMPREPLY=(
-                $(compgen -W "$(satcmd _ls_sc)" "${cur}")
+                $(compgen -W "$(%s _ls_sc)" "${cur}")
             )
     esac
-}
+}'
+
+eval "$(
+    #shellcheck disable=SC2059
+    printf "$__SATURNIN_COMPLETE_CODETMPL" \
+        $__SATURNIN_COMPLETE_CMDNAME \
+        $__SATURNIN_COMPLETE_CMDNAME
+)"
 
-complete -F __satcmd satcmd
+complete -F "__$__SATURNIN_COMPLETE_CMDNAME" "$__SATURNIN_COMPLETE_CMDNAME"

src/shellfu/saturnin.sh

@@ -98,7 +98,7 @@ saturnin__conf() {
         *.*:*)  ig_mode=-e; ig_query=$1; shift 1; break ;;
         *)      warn "bad syntax: $*"; return 2 ;;
     esac done
-    test -n "$ig_mode" || { warn "could not determine inigrep mode"; return 2; }
+    test -n "$ig_mode" || { warn "could not determine inigrep mode"; _saturnin__conf_usage; }
     debug -v ig_limit ig_query ig_mode Strategy
     if test -n "$*";
     then
@@ -108,7 +108,7 @@ saturnin__conf() {
         files=("${ig_query%%.*}$SATURNIN_CONF_SUFFIX")
     else
         warn "dunno what to load"
-        return 2
+        _saturnin__conf_usage
     fi
     debug -v files
     #shellcheck disable=SC2086
@@ -355,6 +355,33 @@ _saturnin__conf__load() {
     true
 }
 
+_saturnin__conf_usage() {
+    #
+    #
+    #
+    mkusage "[options] [-e] SECTION.KEY [FILE...]"                             \
+            "[options] -r SECTION.KEY [FILE...]"                               \
+            "[options] -K SECTION [FILE...]"                                   \
+            "[options] -P [FILE...]"                                           \
+            "[options] -S [FILE...]"                                           \
+        -o                                                                     \
+            "-j     join all files before applying query"                      \
+            "-1     ensure single line is returned"                            \
+        -c                                                                     \
+            "-e     use normal mode (default)"                                 \
+            "-r     use raw mode (preserves RHS whitespace and some comments)" \
+            "-K     list available keys in SECTION"                            \
+            "-S     list available sections"                                   \
+            "-P     list available keypaths (SECTION.KEY)"                     \
+        --                                                                     \
+            "Uses inigrep to query config files.  SECTION is section name (may"\
+            "contain dots itself, KEY is key name.  Unless FILE is provided,"  \
+            "filename is inferred from SECTION (eg. 'foo.ini' if 'foo.bar' was"\
+            "sectionname) and searched in folders given in SATURNIN_CONF_PATH."\
+            "If FILE contains slash, no search is done and just single FILE is"\
+            "used instead."
+}
+
 _saturnin__nl2colon() {
     #
     # Convert newline-based list of paths to colon:based:list