Rename binary: shellfu-get to sfpath

The only purpose of the binary is to show local Shellfu path and it's
in every single Shellfu script.  Let's save people some typing.

README.md

@@ -78,8 +78,8 @@ Usage
 
 After installing, one of the first things you can do is:
 
-    shellfu-get path
-    shellfu-get --version
+    sfpath
+    sfpath --version
 
 That should return path to *shellfu.sh* and version, respectively.
 And that's also *all* this command does.
@@ -103,7 +103,7 @@ Next, you can create your first Shellfu-Bash script:
 
     #!/usr/bin/bash
 
-    . "$(shellfu-get path)" || exit 3
+    . "$(sfpath)" || exit 3
 
     shellfu import pretty
 
@@ -124,7 +124,7 @@ Next, you can create your first Shellfu-Bash script:
 
 This is how above script works:
 
- 1. shellfu-get provides path to the main shellfu.sh, which defines
+ 1. sfpath provides path to the main shellfu.sh, which defines
     `shellfu()` function (plus a bunch of boring variables).
 
  2. Using `shellfu import pretty`, we're importing module called "pretty".

mkit.ini

@@ -43,7 +43,7 @@
 [files]
     bin      = src/bin/shellfu-doc
     bin      = src/bin/shellfu-embed
-    bin      = src/bin/shellfu-get
+    bin      = src/bin/sfpath
     doc      = LICENSE.md
     doc      = README.md
     etc_bc   = src/complete.bash       shellfu.bash

packaging/debian/shellfu.install

@@ -1,5 +1,5 @@
 /etc/bash_completion.d/shellfu.bash
-/usr/bin/shellfu-get
+/usr/bin/sfpath
 /usr/share/doc/shellfu
 /usr/share/doc/shellfu/LICENSE.md
 /usr/share/doc/shellfu/README.md

packaging/template.spec

@@ -88,7 +88,7 @@ make test \
 %dir %{_docdir}/%{name}
 %doc %{_docdir}/%{name}/LICENSE.md
 %doc %{_docdir}/%{name}/README.md
-%{_bindir}/shellfu-get
+%{_bindir}/sfpath
 %{_datadir}/%{name}/shellfu.sh
 
 %files bash

src/bin/shellfu-get.skel → src/bin/sfpath.skel

@@ -7,14 +7,14 @@ case $1 in
     --version-semver)
         echo "__MKIT_PROJ_VERSION__"
         ;;
-    path)
+    "")
         echo "${SHELLFU_DIR:-__SHELLFU_DIR__}/shellfu.sh"
         ;;
     *)
-        echo "usage: shellfu-get path" >&2
-        echo "usage: shellfu-get --version[-semver]" >&2
+        echo "usage: sfpath" >&2
+        echo "usage: sfpath --version[-semver]" >&2
         echo "" >&2
-        echo "Intended usage of shellfu-get is to determine path to library loader"
+        echo "Intended usage of sfpath is to determine path to library loader"
         echo "inside a shellfu script (first usage), or show Shellfu version." >&2
         echo "" >&2
         echo "Other usage is not recommended." >&2

src/bin/shellfu-doc

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(shellfu-get path)" || exit 3
+. "$(sfpath)" || exit 3
 
 shellfu import pretty
 
@@ -51,7 +51,7 @@ export_as_manpage() {
             --center "User Contributed Shellfu Documentation" \
             --section 3x \
             --date "$(date -I -r "$mfile")" \
-            --release "shellfu v$(shellfu-get --version-semver)" \
+            --release "shellfu v$(sfpath --version-semver)" \
             --utf8 -q \`
 }
 

src/complete.bash

@@ -1,23 +1,15 @@
 
-__shellfu_get() {
+__sfpath() {
     local cur prev opts
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
     opts="--version --version-semver"
-    cmds="path"
+    COMPREPLY=(
+        $(compgen -W "$opts" -- ${cur})
+    )
+}
 
-    case "$cur" in
-        --*)
-            COMPREPLY=(
-                $(compgen -W "$opts" -- ${cur})
-            )
-            ;;
-        *)
-            COMPREPLY=(
-                $(compgen -W "$cmds" ${cur})
-            )
-    esac
 }
 
-complete -F __shellfu_get shellfu-get
+complete -F __sfpath sfpath

tests/TF_HEADER

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-echo "version = $(shellfu-get --version-semver)"
-echo "bin = $(which shellfu-get)"
-echo "init = $(shellfu-get path)"
+echo "version = $(sfpath --version-semver)"
+echo "bin = $(which sfpath)"
+echo "init = $(sfpath)"

tests/inigrep_chars/TF_RUN

@@ -3,7 +3,7 @@
 . "$TF_DIR/include/subtest.sh"
 . "$TF_DIR/include/tools.sh"
 
-. "$(shellfu-get path)" || tf_exit_error "failed to init shellfu"
+. "$(sfpath)" || tf_exit_error "failed to init shellfu"
 export PRETTY=plain
 shellfu import inigrep  || tf_exit_error "failed to import inigrep"
 

tests/inigrep_inigrep/TF_RUN

@@ -3,7 +3,7 @@
 . "$TF_DIR/include/subtest.sh"
 . "$TF_DIR/include/tools.sh"
 
-. "$(shellfu-get path)" || tf_exit_error "failed to init shellfu"
+. "$(sfpath)" || tf_exit_error "failed to init shellfu"
 shellfu import inigrep  || tf_exit_error "failed to import inigrep"
 
 tf_enum_subtests() {

tests/mdfmt/TF_RUN

@@ -3,7 +3,7 @@
 . "$TF_DIR/include/subtest.sh"
 . "$TF_DIR/include/tools.sh"
 
-. "$(shellfu-get path)" || tf_exit_error "failed to init shellfu"
+. "$(sfpath)" || tf_exit_error "failed to init shellfu"
 export PRETTY=plain
 shellfu import mdfmt    || tf_exit_error "failed to import mdfmt"
 

tests/pretty_basic/TF_RUN

@@ -3,7 +3,7 @@
 . "$TF_DIR/include/subtest.sh"
 . "$TF_DIR/include/tools.sh"
 
-. "$(shellfu-get path)" || tf_exit_error "failed to init shellfu"
+. "$(sfpath)" || tf_exit_error "failed to init shellfu"
 PRETTY=plain
 shellfu import pretty   || tf_exit_error "failed to import pretty"
 

tests/pretty_basic/test/wrap_debug

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(shellfu-get path)"
+. "$(sfpath)"
 
 shellfu import pretty
 

tests/pretty_basic/test/wrap_die

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(shellfu-get path)"
+. "$(sfpath)"
 
 shellfu import pretty
 

tests/pretty_basic/test/wrap_mkusage

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(shellfu-get path)"
+. "$(sfpath)"
 
 shellfu import pretty
 

tests/pretty_basic/test/wrap_mkusage-subcommand

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(shellfu-get path)"
+. "$(sfpath)"
 
 shellfu import pretty
 

tests/pretty_basic/test/wrap_mkusage_0

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(shellfu-get path)"
+. "$(sfpath)"
 
 shellfu import pretty
 

tests/pretty_basic/test/wrap_mkusage_0w

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(shellfu-get path)"
+. "$(sfpath)"
 
 shellfu import pretty
 

tests/pretty_basic/test/wrap_mkusage_1

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(shellfu-get path)"
+. "$(sfpath)"
 
 shellfu import pretty
 

tests/pretty_basic/test/wrap_mkusage_2

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(shellfu-get path)"
+. "$(sfpath)"
 
 shellfu import pretty
 

tests/pretty_basic/test/wrap_mkusage_all

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(shellfu-get path)"
+. "$(sfpath)"
 
 shellfu import pretty
 

tests/pretty_basic/test/wrap_mkusage_allw

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(shellfu-get path)"
+. "$(sfpath)"
 
 shellfu import pretty
 

tests/pretty_basic/test/wrap_mkusage_c

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(shellfu-get path)"
+. "$(sfpath)"
 
 shellfu import pretty
 

tests/pretty_basic/test/wrap_mkusage_conflict

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(shellfu-get path)"
+. "$(sfpath)"
 
 shellfu import pretty
 

tests/pretty_basic/test/wrap_mkusage_i

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(shellfu-get path)"
+. "$(sfpath)"
 
 shellfu import pretty
 

tests/pretty_basic/test/wrap_mkusage_o

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(shellfu-get path)"
+. "$(sfpath)"
 
 shellfu import pretty
 

tests/pretty_basic/test/wrap_mkusage_p

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(shellfu-get path)"
+. "$(sfpath)"
 
 shellfu import pretty
 

tests/pretty_basic/test/wrap_mkusage_self

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. "$(shellfu-get path)"
+. "$(sfpath)"
 
 shellfu import pretty
 

tests/shellfu_import/TF_RUN

@@ -72,8 +72,8 @@ wrap_test() {
         mksnippet "$name.before"
         cat "test/$name.sh"
     fi \
-      | sed -e "s|\\<shellfu-get\\>|SHELLFU_DIR=${shellfu_init%/*}  $shellfu_get_path|"
-    #   ^^^ make `shellfu-get` work even if PATH is empty:
+      | sed -e "s|\\<sfpath\\>|SHELLFU_DIR=${shellfu_init%/*}  $sfpath|"
+    #   ^^^ make `sfpath` work even if PATH is empty:
     mksnippet "$name.after"
 }
 
@@ -101,8 +101,8 @@ tf_do_subtest() {
 }
 
 export LANG=C
-shellfu_get_path=$(which shellfu-get)
-shellfu_init=$(shellfu-get path)
+sfpath=$(which sfpath)  || tf_exit_error "cannot find sfpath"
+shellfu_init=$(sfpath)  || tf_exit_error "sfpath failed"
 ignored > _ignored_
 
 tf_do_subtests

tests/shellfu_import/test/import_fn.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 SHELLFU_INCLUDE=test/include
-. $(shellfu-get path)
+. $(sfpath)
 shellfu import mod_f

tests/shellfu_import/test/import_var.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 SHELLFU_INCLUDE=test/include
-. $(shellfu-get path)
+. $(sfpath)
 shellfu import mod_v

tests/shellfu_import/test/import_var_fn.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 SHELLFU_INCLUDE=test/include
-. $(shellfu-get path)
+. $(sfpath)
 shellfu import mod_v_f

tests/shellfu_import/test/import_var_fn_bash.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 SHELLFU_INCLUDE=test/include
-. $(shellfu-get path)
+. $(sfpath)
 shellfu import mod_v_f_bash

tests/shellfu_import/test/import_var_fn_bash_hint.sh

@@ -1,4 +1,4 @@
 SHELLFU_INCLUDE=test/include
 SHELLFU_COMPAT=bash
-. $(shellfu-get path)
+. $(sfpath)
 shellfu import mod_v_f_bash

tests/shellfu_import/test/try_import_fn.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 SHELLFU_INCLUDE=test/include
-. $(shellfu-get path)
+. $(sfpath)
 shellfu try_import mod_f

tests/shellfu_import/test/try_import_var.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 SHELLFU_INCLUDE=test/include
-. $(shellfu-get path)
+. $(sfpath)
 shellfu try_import mod_v

tests/shellfu_import/test/try_import_var_fn.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 SHELLFU_INCLUDE=test/include
-. $(shellfu-get path)
+. $(sfpath)
 shellfu try_import mod_v_f

tests/shellfu_version/TF_RUN

@@ -22,7 +22,7 @@ mkwrapper() {
     local modname=$1
     echo '#!/bin/bash'
     echo 'SHELLFU_PATH=test/shellfu'
-    echo '. "$(shellfu-get path)" || exit 3'
+    echo '. "$(sfpath)" || exit 3'
     echo "shellfu version $modname"
 }