From 25d1b3fb09af09b5a7e5c95fb7159c8faef84cf1 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Wed, 11 May 2022 16:49:35 -0300 Subject: [PATCH] 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 --- config/bash/Makefile.am | 4 ++-- config/bash/{lxc.in => _lxc.in} | 0 config/bash/meson.build | 6 +++--- configure.ac | 2 +- src/lxc/Makefile.am | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename config/bash/{lxc.in => _lxc.in} (100%) diff --git a/config/bash/Makefile.am b/config/bash/Makefile.am index b97e2a499..a45f10ea6 100644 --- 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 f261995d7..5dc5dcda0 100644 --- 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 581f0d7d4..946a90937 100644 --- 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 a1955a838..6bdb50eb6 100644 --- 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 -- 2.47.2