Skip to content

Commit 612b8df

Browse files
nabijaczlewelibehlendorf
authored andcommitted
contrib: bash_completion.d: install, fix dist
dist diff: -zfs-2.1.99/contrib/bash_completion.d/zfs install diff: +destdir/usr/local/etc/bash_completion.d +destdir/usr/local/etc/bash_completion.d/zfs Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes #13316
1 parent 0a9aaa7 commit 612b8df

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

contrib/bash_completion.d/Makefile.am

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
noinst_DATA = %D%/zfs
2-
EXTRA_DIST += $(noinst_DATA)
3-
SUBSTFILES += $(noinst_DATA)
1+
bashcompletiondir = $(sysconfdir)/bash_completion.d
42

5-
SHELLCHECKSCRIPTS += $(noinst_DATA)
6-
$(call SHELLCHECK_OPTS,$(noinst_DATA)): SHELLCHECK_SHELL = bash
3+
nodist_bashcompletion_DATA = %D%/zfs
4+
SUBSTFILES += $(nodist_bashcompletion_DATA)
5+
6+
SHELLCHECKSCRIPTS += $(nodist_bashcompletion_DATA)
7+
$(call SHELLCHECK_OPTS,$(nodist_bashcompletion_DATA)): SHELLCHECK_SHELL = bash

rpm/generic/zfs.spec.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,8 @@ systemctl --system daemon-reload >/dev/null || true
518518
%config(noreplace) %{_sysconfdir}/%{name}/vdev_id.conf.*.example
519519
%attr(440, root, root) %config(noreplace) %{_sysconfdir}/sudoers.d/*
520520

521+
%config(noreplace) %{_sysconfdir}/bash_completion.d/zfs
522+
521523
%files -n libzpool5
522524
%{_libdir}/libzpool.so.*
523525

0 commit comments

Comments
 (0)