manager: kresctl: shell-completion files renamed

diff --git a/distro/pkg/deb/python3-knot-resolver-manager.install b/distro/pkg/deb/python3-knot-resolver-manager.install
index c574cc5e4e03196d9d08fa9694a89573bfab3eb0..3ec23ee129d07ba3858c26590d00a65325a42c43 100644 (file)
--- a/distro/pkg/deb/python3-knot-resolver-manager.install
+++ b/distro/pkg/deb/python3-knot-resolver-manager.install
@@ -1,4 +1,4 @@
 etc/knot-resolver/config.yml
 usr/lib/systemd/system/knot-resolver.service
 usr/share/bash-completion/completions/kresctl
-usr/share/fish/vendor_completions.d/kresctl.fish
+usr/share/fish/completions/kresctl.fish

diff --git a/distro/pkg/deb/rules b/distro/pkg/deb/rules
index 71d67bbd114e83d4234b2a6439262a270c1c4835..9864d5dedbe446b1da43f692b041cf3f79d29de9 100755 (executable)
--- a/distro/pkg/deb/rules
+++ b/distro/pkg/deb/rules
@@ -43,8 +43,8 @@ override_dh_auto_install:
        DESTDIR="${PWD}/debian/tmp" ninja -v -C build_deb install
        dh_auto_install --buildsystem=pybuild --sourcedirectory manager
        install -m 644 -D $(CURDIR)/manager/etc/knot-resolver/config.yml $(CURDIR)/debian/tmp/etc/knot-resolver/config.yml
-       install -m 644 -D $(CURDIR)/manager/shell-completion/kresctl.bash $(CURDIR)/debian/tmp/usr/share/bash-completion/completions/kresctl
-       install -m 644 -D $(CURDIR)/manager/shell-completion/kresctl.fish $(CURDIR)/debian/tmp/usr/share/fish/vendor_completions.d/kresctl.fish
+       install -m 644 -D $(CURDIR)/manager/shell-completion/client.bash $(CURDIR)/debian/tmp/usr/share/bash-completion/completions/kresctl
+       install -m 644 -D $(CURDIR)/manager/shell-completion/client.fish $(CURDIR)/debian/tmp/usr/share/fish/completions/kresctl.fish
 
 override_dh_auto_test:
        meson test -C build_deb

diff --git a/distro/pkg/rpm/knot-resolver.spec b/distro/pkg/rpm/knot-resolver.spec
index 11b7c98e69dbaade40482f972ac2faa87fce4739..cff04740b98d498f79890b0ccead5ba3bcdeb603 100644 (file)
--- a/distro/pkg/rpm/knot-resolver.spec
+++ b/distro/pkg/rpm/knot-resolver.spec
@@ -229,8 +229,8 @@ mv %{buildroot}/%{_datadir}/doc/%{name}/* %{buildroot}/%{_pkgdocdir}/
 pushd manager
 %py3_install
 install -m 644 -D etc/knot-resolver/config.yml %{buildroot}%{_sysconfdir}/knot-resolver/config.yml
-install -m 644 -D shell-completion/kresctl.bash %{buildroot}%{_datarootdir}/bash-completion/completions/kresctl
-install -m 644 -D shell-completion/kresctl.fish %{buildroot}%{_datarootdir}/fish/vendor_completions.d/kresctl.fish
+install -m 644 -D shell-completion/client.bash %{buildroot}%{_datarootdir}/bash-completion/completions/kresctl
+install -m 644 -D shell-completion/client.fish %{buildroot}%{_datarootdir}/fish/completions/kresctl.fish
 
 popd
 
@@ -385,7 +385,7 @@ fi
 %{_unitdir}/knot-resolver.service
 %{_bindir}/kresctl
 %{_datarootdir}/bash-completion/completions/kresctl
-%{_datarootdir}/fish/vendor_completions.d/kresctl.fish
+%{_datarootdir}/fish/completions/kresctl.fish
 
 %changelog
 * {{ now }} Jakub Ružička <jakub.ruzicka@nic.cz> - {{ version }}-{{ release }}

diff --git a/manager/shell-completion/kresctl.bash b/manager/shell-completion/client.bash
similarity index 81%
rename from manager/shell-completion/kresctl.bash
rename to manager/shell-completion/client.bash
index 7363913298546f8336a82a076f737c20695b8399..6e77311a237b8adf2e5e83b8247a00a2be389144 100644 (file)
--- a/manager/shell-completion/kresctl.bash
+++ b/manager/shell-completion/client.bash
@@ -1,7 +1,7 @@
 #/usr/bin/env bash
 
 # completion function for the kresctl
-_kresctl_completion() {
+__kresctl_completion() {
     local cur prev opts
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
@@ -19,4 +19,4 @@ _kresctl_completion() {
 }
 
 # use the bash default completion for other arguments
-complete -o filenames -o nospace -o bashdefault -F _kresctl_completion kresctl
\ No newline at end of file
+complete -o filenames -o nospace -o bashdefault -F __kresctl_completion kresctl
\ No newline at end of file

diff --git a/manager/shell-completion/client.fish b/manager/shell-completion/client.fish
new file mode 100644 (file)
index 0000000..ec3a0ab
--- /dev/null
+++ b/manager/shell-completion/client.fish
@@ -0,0 +1,6 @@
+function __kresctl_completion
+    set -l args (commandline -pco)
+    eval command kresctl $args
+end
+
+complete -c kresctl -a '(__kresctl_completion)' -f
\ No newline at end of file

diff --git a/manager/shell-completion/kresctl.fish b/manager/shell-completion/kresctl.fish
deleted file mode 100644 (file)
index 8fc75a8..0000000
--- a/manager/shell-completion/kresctl.fish
+++ /dev/null
@@ -1,6 +0,0 @@
-function __fish_git
-    set -l args (commandline -pco)
-    eval command kresctl $args
-end
-
-complete -c kresctl -a '(_kresctl_completion)' -f
\ No newline at end of file