]> git.proxmox.com Git - mirror_zfs.git/commitdiff
contrib: debian: drop bashcompletion mangling after install
authorStoiko Ivanov <s.ivanov@proxmox.com>
Wed, 20 Sep 2023 08:25:37 +0000 (10:25 +0200)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 3 Oct 2023 00:06:41 +0000 (17:06 -0700)
tested by running:
```
./configure --with-config=user; cp -a contrib/debian .
dpkg-buildpackage -b -uc -us
```
on a Debian 12 based system.

and checking where the completion file got installed.

Reviewed-by: Umer Saleem <usaleem@ixsystems.com>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Closes #15304

contrib/debian/openzfs-zfsutils.install
contrib/debian/rules.in

index e2ce5084c09534f4a431bd5fb30e6f8c618f5b65..741014398ade2345dcdc0628bab66f13dde3218c 100644 (file)
@@ -1,7 +1,6 @@
 etc/default/zfs
 etc/zfs/zfs-functions
 etc/zfs/zpool.d/
-etc/bash_completion.d/zfs
 lib/systemd/system-generators/
 lib/systemd/system-preset/
 lib/systemd/system/zfs-import-cache.service
index f0791cfabd386842fe23a435dc90eab9d396b0be..a3a05efacb502b722002c1f95e392948b0ccbc74 100755 (executable)
@@ -71,10 +71,6 @@ override_dh_auto_install:
        @# Install the utilities.
        $(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
 
-       # Use upstream's bash completion
-       install -D -t '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/' \
-               '$(CURDIR)/contrib/bash_completion.d/zfs'
-
        # Move from bin_dir to /usr/sbin
        # Remove suffix (.py) as per policy 10.4 - Scripts
        # https://www.debian.org/doc/debian-policy/ch-files.html#s-scripts
@@ -136,7 +132,6 @@ override_dh_auto_install:
 
        chmod a-x '$(CURDIR)/debian/tmp/etc/zfs/zfs-functions'
        chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs'
-       chmod a-x '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/zfs'
 
 override_dh_python3:
        dh_python3 -p openzfs-python3-pyzfs