Skip to content

Commit

Permalink
bash: rename main bash completion file
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
terceiro committed May 12, 2022
1 parent 053cb08 commit 25d1b3f
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions 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
File renamed without changes.
6 changes: 3 additions & 3 deletions config/bash/meson.build
Expand Up @@ -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)

Expand Down Expand Up @@ -34,6 +34,6 @@ foreach cmd: [
'lxc-wait',
]
install_symlink(cmd,
pointing_to: 'lxc',
pointing_to: '_lxc',
install_dir: bashcompletiondir)
endforeach
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/lxc/Makefile.am
Expand Up @@ -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
Expand Down

0 comments on commit 25d1b3f

Please sign in to comment.