From 612b8dff5bc3d827efb864a199a62bda1a419254 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczleweli@nabijaczleweli.xyz>
Date: Sun, 10 Apr 2022 23:10:02 +0200
Subject: [PATCH] contrib: bash_completion.d: install, fix dist
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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 <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13316
---
 contrib/bash_completion.d/Makefile.am | 11 ++++++-----
 rpm/generic/zfs.spec.in               |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/contrib/bash_completion.d/Makefile.am b/contrib/bash_completion.d/Makefile.am
index 4f451fb1d82..dc4b610c42b 100644
--- a/contrib/bash_completion.d/Makefile.am
+++ b/contrib/bash_completion.d/Makefile.am
@@ -1,6 +1,7 @@
-noinst_DATA  = %D%/zfs
-EXTRA_DIST  += $(noinst_DATA)
-SUBSTFILES  += $(noinst_DATA)
+bashcompletiondir = $(sysconfdir)/bash_completion.d
 
-SHELLCHECKSCRIPTS += $(noinst_DATA)
-$(call SHELLCHECK_OPTS,$(noinst_DATA)): SHELLCHECK_SHELL = bash
+nodist_bashcompletion_DATA  = %D%/zfs
+SUBSTFILES                 += $(nodist_bashcompletion_DATA)
+
+SHELLCHECKSCRIPTS   += $(nodist_bashcompletion_DATA)
+$(call SHELLCHECK_OPTS,$(nodist_bashcompletion_DATA)): SHELLCHECK_SHELL = bash
diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
index 4b78a93085a..0a29601639c 100644
--- a/rpm/generic/zfs.spec.in
+++ b/rpm/generic/zfs.spec.in
@@ -518,6 +518,8 @@ systemctl --system daemon-reload >/dev/null || true
 %config(noreplace) %{_sysconfdir}/%{name}/vdev_id.conf.*.example
 %attr(440, root, root) %config(noreplace) %{_sysconfdir}/sudoers.d/*
 
+%config(noreplace) %{_sysconfdir}/bash_completion.d/zfs
+
 %files -n libzpool5
 %{_libdir}/libzpool.so.*
 
-- 
2.45.2