Re-package with better granularity

Switch to packaging model where each module goes into separate package.

Such model makes much more sense (after all it's also how big platforms
such as python do it).  It allows better control over dependencies and
allows re-locating modules properly according to compatibility level
(i.e. now exit.sh can go to 'sh' despite the fact that in 'core' it had
to be with other Bash-compatible modules).

packaging/debian/control

@@ -40,10 +40,10 @@ Description: Bash-specific base
  This sub-package contains Bash-specific parts of library infrastructure.
  Shellfu modules written for Bash should depend on this.
 
-Package: shellfu-bash-core
+Package: shellfu-bash-inigrep
 Architecture: all
-Depends: shellfu-bash
-Description: Core Bash modules for Shellfu
+Depends: shellfu-bash, shellfu-bash-pretty
+Description: INI grepping Shellfu/Bash module
  Shellfu is an attempt to add modularity to your shell scripts.
  .
  With Shellfu you can develop your shell modules separately from your
@@ -54,12 +54,13 @@ Description: Core Bash modules for Shellfu
  amount of reliable body of shell scripts, and access to advanced modular
  languages such as Python or Perl is limited.
  .
- This sub-package contains core Shellfu modules.
+ This sub-package contains 'inigrep', Shellfu/Bash module for reading
+ INI-like files.
 
-Package: shellfu-bash-extras
+Package: shellfu-bash-pretty
 Architecture: all
-Depends: shellfu-bash, shellfu-bash-core
-Description: Extra Bash modules for Shellfu
+Depends: shellfu-bash
+Description: Logging Shellfu/Bash module
  Shellfu is an attempt to add modularity to your shell scripts.
  .
  With Shellfu you can develop your shell modules separately from your
@@ -70,12 +71,11 @@ Description: Extra Bash modules for Shellfu
  amount of reliable body of shell scripts, and access to advanced modular
  languages such as Python or Perl is limited.
  .
- This sub-package contains extra Shellfu modules, most of them under
- heavy development.
+ This sub-package contains 'pretty', universal Shellfu logging module.
 
 Package: shellfu-devel
 Architecture: all
-Depends: shellfu-bash-core
+Depends: shellfu-bash-pretty
 Description: Essential developer tools
  Shellfu is an attempt to add modularity to your shell scripts.
  .
@@ -107,6 +107,40 @@ Description: Bash-specific base
  This sub-package contains POSIX-oriented parts of library infrastructure.
  Generic Shellfu modules aiming for POSIX compatibility should depend on this.
 
+Package: shellfu-sh-charmenu
+Architecture: all
+Depends: shellfu-sh
+Description: Shellfu/sh module for building interactive terminal menus
+ Shellfu is an attempt to add modularity to your shell scripts.
+ .
+ With Shellfu you can develop your shell modules separately from your
+ scripts, and test, use, explore or study them without need to be aware
+ of details such as where the actual files are placed.
+ .
+ Shellfu is mostly intended for cases when there's need for non-trivial
+ amount of reliable body of shell scripts, and access to advanced modular
+ languages such as Python or Perl is limited.
+ .
+ This sub-package contains 'charmenu', a Shellfu/sh module for building
+ interactive terminal menus
+
+Package: shellfu-sh-exit
+Architecture: all
+Depends: shellfu-sh
+Description: Shellfu/sh module for standard exit statuses
+ Shellfu is an attempt to add modularity to your shell scripts.
+ .
+ With Shellfu you can develop your shell modules separately from your
+ scripts, and test, use, explore or study them without need to be aware
+ of details such as where the actual files are placed.
+ .
+ Shellfu is mostly intended for cases when there's need for non-trivial
+ amount of reliable body of shell scripts, and access to advanced modular
+ languages such as Python or Perl is limited.
+ .
+ This sub-package contains 'exit', Shellfu module containing functions
+ and variables for standard exit statuses.
+
 Package: shellfu-sh-mdfmt
 Architecture: all
 Depends: shellfu-sh
@@ -124,5 +158,22 @@ Description: Markdown formatting helper
  This sub-package contains Markdown formatting helper, a function that
  Helps you generate Markdown paragraph elements from your shell scripts.
 
+Package: shellfu-sh-termcolors
+Architecture: all
+Depends: shellfu-sh
+Description: Shellfu/sh module for terminal color names
+ Shellfu is an attempt to add modularity to your shell scripts.
+ .
+ With Shellfu you can develop your shell modules separately from your
+ scripts, and test, use, explore or study them without need to be aware
+ of details such as where the actual files are placed.
+ .
+ Shellfu is mostly intended for cases when there's need for non-trivial
+ amount of reliable body of shell scripts, and access to advanced modular
+ languages such as Python or Perl is limited.
+ .
+ This sub-package contains 'termcolors', Shellfu module containing most
+ common ANSI color names.
+
 
 # control file built with MKit __MKIT_SELF_VERSION__

packaging/debian/shellfu-bash-extras.install

@@ -1,2 +0,0 @@
-/usr/share/shellfu/include-bash/charmenu.sh
-/usr/share/shellfu/include-bash/inigrep.sh

packaging/debian/shellfu-bash-inigrep.install

@@ -0,0 +1 @@
+/usr/share/shellfu/include-bash/inigrep.sh

packaging/debian/shellfu-bash-core.install → packaging/debian/shellfu-bash-pretty.install

@@ -3,6 +3,4 @@
 /usr/share/shellfu/include-bash/_pretty_journald.sh
 /usr/share/shellfu/include-bash/_pretty_notify.sh
 /usr/share/shellfu/include-bash/_pretty_plain.sh
-/usr/share/shellfu/include-bash/exit.sh
 /usr/share/shellfu/include-bash/pretty.sh
-/usr/share/shellfu/include-bash/termcolors.sh

packaging/debian/shellfu-sh-charmenu.install

@@ -0,0 +1 @@
+/usr/share/shellfu/include-sh/charmenu.sh

packaging/debian/shellfu-sh-exit.install

@@ -0,0 +1 @@
+/usr/share/shellfu/include-sh/exit.sh

packaging/debian/shellfu-sh-termcolors.install

@@ -0,0 +1 @@
+/usr/share/shellfu/include-sh/termcolors.sh

packaging/template.spec

@@ -31,23 +31,24 @@ Requires: shellfu
 This sub-package contains Bash-specific parts of library infrastructure.
 Shellfu modules written for Bash should depend on this.
 
-%package bash-core
-Summary: Core Bash modules for Shellfu
+%package bash-inigrep
+Summary: INI grepping Shellfu/Bash module
 Requires: shellfu-bash
-%description bash-core
-This sub-package contains core Shellfu modules.
+Requires: shellfu-bash-pretty
+%description bash-inigrep
+This sub-package contains 'inigrep', Shellfu/Bash module for reading
+INI-like files.
 
-%package bash-extras
-Summary: Extra Bash modules for Shellfu
+%package bash-pretty
+Summary: Logging Shellfu/Bash module
 Requires: shellfu-bash
-Requires: shellfu-bash-core
-%description bash-extras
-This sub-package contains extra Shellfu modules, most of them under
-heavy development.
+Requires: shellfu-sh-termcolors
+%description bash-pretty
+This sub-package contains 'pretty', universal Shellfu logging module.
 
 %package devel
 Summary: Essential developer tools
-Requires: shellfu-bash-core
+Requires: shellfu-bash-pretty
 %description devel
 This sub-package contains tools useful mostly for development of shellfu
 scripts.
@@ -59,6 +60,20 @@ Requires: shellfu
 This sub-package contains POSIX-oriented parts of library infrastructure.
 Generic Shellfu modules aiming for POSIX compatibility should depend on this.
 
+%package sh-charmenu
+Summary: Shellfu/sh module for building interactive terminal menus
+Requires: shellfu-sh
+%description sh-charmenu
+This sub-package contains 'charmenu', a Shellfu/sh module for building
+interactive terminal menus
+
+%package sh-exit
+Summary: Shellfu/sh module for standard exit statuses
+Requires: shellfu-sh
+%description sh-exit
+This sub-package contains 'exit', Shellfu module containing few
+common ANSI color names.
+
 %package sh-mdfmt
 Summary: Markdown formatting helper
 Requires: shellfu-sh
@@ -66,6 +81,13 @@ Requires: shellfu-sh
 This sub-package contains Markdown formatting helper, a function that
 helps you generate Markdown paragraph elements from your shell scripts.
 
+%package sh-termcolors
+Summary: Shellfu/sh module for terminal color names
+Requires: shellfu-sh
+%description sh-termcolors
+This sub-package contains 'termcolors', Shellfu module containing most
+common ANSI color names.
+
 
 %prep
 %setup -q
@@ -94,19 +116,16 @@ make test \
 %files bash
 %dir %{_datadir}/%{name}/include-bash
 
-%files bash-core
+%files bash-inigrep
+%{_datadir}/%{name}/include-bash/inigrep.sh
+
+%files bash-pretty
 %{_datadir}/%{name}/include-bash/_pretty_color.sh
 %{_datadir}/%{name}/include-bash/_pretty_html.sh
 %{_datadir}/%{name}/include-bash/_pretty_journald.sh
 %{_datadir}/%{name}/include-bash/_pretty_notify.sh
 %{_datadir}/%{name}/include-bash/_pretty_plain.sh
-%{_datadir}/%{name}/include-bash/exit.sh
 %{_datadir}/%{name}/include-bash/pretty.sh
-%{_datadir}/%{name}/include-bash/termcolors.sh
-
-%files bash-extras
-%{_datadir}/%{name}/include-bash/charmenu.sh
-%{_datadir}/%{name}/include-bash/inigrep.sh
 
 %files devel
 %{_bindir}/sfembed
@@ -114,9 +133,18 @@ make test \
 %files sh
 %dir %{_datadir}/%{name}/include-sh
 
+%files sh-charmenu
+%{_datadir}/%{name}/include-sh/charmenu.sh
+
+%files sh-exit
+%{_datadir}/%{name}/include-sh/exit.sh
+
 %files sh-mdfmt
 %{_datadir}/%{name}/include-sh/mdfmt.sh
 
+%files sh-termcolors
+%{_datadir}/%{name}/include-sh/termcolors.sh
+
 %changelog
 
 # specfile built with MKit __MKIT_SELF_VERSION__

src/include-bash/charmenu.sh → src/include-sh/charmenu.sh

@@ -1,4 +1,4 @@
-shellfu import pretty
+#!/bin/sh
 
 
 CHARMENU_FILE="${CHARMENU_FILE:-}"
@@ -50,7 +50,7 @@ charmenu() {
     # call `charmenu full arg1 arg2...` to have your arguments
     # expanded in the full menu.  More fleshed out example:
     #
-    #     . "$(shellfu-get path)" || exit 3
+    #     . "$(sfpath)" || exit 3
     #     shellfu import charmenu
     #     shellfu import pretty
     #
@@ -110,7 +110,7 @@ charmenu() {
             printf "$menu\n" "$@"
             ;;
         items)  # print just the list of actions
-            paste -sd"$delim" <<<"$alist"
+            echo "$alist" paste -sd"$delim"
             ;;
         prompt) # print prompt for user
             printf "$prompt" "$(charmenu items)"
@@ -118,7 +118,7 @@ charmenu() {
         has)    # check if response is valid ("on the menu")
             local res="$1"
             test -n "$res" || return 1      # "" is not valid
-            grep $cases -e "^$res$" <<<"$alist"
+            echo "$alist" | grep $cases -e "^$res$"
             return $?
             ;;
     esac

src/include-bash/exit.sh → src/include-sh/exit.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 
 EXIT_OK=0

src/include-bash/termcolors.sh → src/include-sh/termcolors.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 #
 # Color definitions