bash: rename main bash completion file

Since the `lxc` binary is actually provided by lxd, the main
bash-completion file needs to be moved away to not conflict with a bash
completion file provided for the `lxc` binary by lxd.

Signed-off-by: Antonio Terceiro <terceiro@debian.org>

diff --git a/config/bash/Makefile.am b/config/bash/Makefile.am
index b97e2a4991b9aa38cba81f1ca5489e1975078559..a45f10ea642f7c7ac3aebe6eccdef143c8f705fa 100644 (file)
--- a/config/bash/Makefile.am
+++ b/config/bash/Makefile.am
@@ -1,5 +1,5 @@
-EXTRA_DIST = lxc
+EXTRA_DIST = _lxc
 
 if ENABLE_BASH
-dist_bashcomp_DATA = lxc
+dist_bashcomp_DATA = _lxc
 endif

diff --git a/config/bash/lxc.in b/config/bash/_lxc.in
similarity index 100%
rename from config/bash/lxc.in
rename to config/bash/_lxc.in

diff --git a/config/bash/meson.build b/config/bash/meson.build
index f261995d7e5a2a9c6883685920082ae684e0e587..5dc5dcda055d829a60b41f8cb71a92c021b06014 100644 (file)
--- a/config/bash/meson.build
+++ b/config/bash/meson.build
@@ -2,8 +2,8 @@
 
 bash_completion = configure_file(
     configuration: conf,
-    input: 'lxc.in',
-    output: 'lxc',
+    input: '_lxc.in',
+    output: '_lxc',
     install: true,
     install_dir: bashcompletiondir)
 
@@ -34,6 +34,6 @@ foreach cmd: [
     'lxc-wait',
 ]
     install_symlink(cmd,
-        pointing_to: 'lxc',
+        pointing_to: '_lxc',
         install_dir: bashcompletiondir)
 endforeach

diff --git a/configure.ac b/configure.ac
index 581f0d7d495b891b1388c1c044fd3c5f70864c64..946a90937a5a3ecad1d4e0510bf15502266b8fff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -899,7 +899,7 @@ AC_CONFIG_FILES([
        config/apparmor/abstractions/start-container
        config/selinux/Makefile
        config/bash/Makefile
-       config/bash/lxc
+       config/bash/_lxc
        config/init/Makefile
        config/init/common/Makefile
        config/init/common/lxc-containers

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index a1955a8384ca005abdab034b9d2764f4caf68885..6bdb50eb65ba867ca0ea5a77be69a1367e7ccdaf 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -2682,7 +2682,7 @@ if ENABLE_BASH
 install-data-local:
        cd $(DESTDIR)$(bashcompdir); \
        for bin in $(bin_PROGRAMS) ; do \
-               ln -sf lxc $$bin ; \
+               ln -sf _lxc $$bin ; \
        done
 endif
 endif