Move sfdoc to main package

mkit.ini

@@ -47,7 +47,6 @@
     doc      = LICENSE.md
     doc      = README.md
     etc_bc   = src/complete.bash       shellfu.bash
-    etc_bc   = src/complete-devel.bash shellfu-devel.bash
     includes = src/include-bash
     includes = src/include-sh
     share    = src/shellfu.sh

packaging/debian/control

@@ -88,8 +88,7 @@ Description: Essential developer tools
  languages such as Python or Perl is limited.
  .
  This sub-package contains tools useful mostly for development of shellfu
- scripts; most notably shellfu-doc which provides access to online
- (as in traditional man pages) documentation of shellfu modules.
+ scripts.
 
 Package: shellfu-sh
 Architecture: all

packaging/debian/shellfu-devel.install

@@ -1,3 +1 @@
-/etc/bash_completion.d/shellfu-devel.bash
-/usr/bin/sfdoc
 /usr/bin/sfembed

packaging/debian/shellfu.install

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

packaging/template.spec

@@ -50,8 +50,7 @@ Summary: Essential developer tools
 Requires: shellfu-bash-core
 %description devel
 This sub-package contains tools useful mostly for development of shellfu
-scripts; most notably sfdoc which provides access to online
-(as in traditional man pages) documentation of shellfu modules.
+scripts.
 
 %package sh
 Summary: Generic base
@@ -88,6 +87,7 @@ make test \
 %dir %{_docdir}/%{name}
 %doc %{_docdir}/%{name}/LICENSE.md
 %doc %{_docdir}/%{name}/README.md
+%{_bindir}/sfdoc
 %{_bindir}/sfpath
 %{_datadir}/%{name}/shellfu.sh
 
@@ -110,8 +110,6 @@ make test \
 %{_datadir}/%{name}/include-bash/sync.sh
 
 %files devel
-%config %{_sysconfdir}/bash_completion.d/shellfu-devel.bash
-%{_bindir}/sfdoc
 %{_bindir}/sfembed
 
 %files sh

src/complete-devel.bash

@@ -1,13 +0,0 @@
-
-__shellfu_doc() {
-    local cur prev opts
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-    args="--help --debug --include --ls --lsmod --lsfun --lsvar --export --name"
-    COMPREPLY=(
-        $(compgen -W "$args" -- ${cur})
-    )
-}
-
-complete -F __shellfu_doc shellfu-doc

src/complete.bash

@@ -10,6 +10,16 @@ __sfpath() {
     )
 }
 
+__sfdoc() {
+    local cur prev opts
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    args="--help --debug --include --ls --lsmod --lsfun --lsvar --export --name"
+    COMPREPLY=(
+        $(compgen -W "$args" -- ${cur})
+    )
 }
 
 complete -F __sfpath sfpath
+complete -F __sfdoc sfdoc