| 1 |
jlec 14/10/30 08:50:24 |
| 2 |
|
| 3 |
Added: lxc-1.0.6-bash-completion.patch |
| 4 |
Log: |
| 5 |
app-emulation/lxc: Fix installation of bash-completions, #525808; thanks i.Dark_Templar for the initial patch |
| 6 |
|
| 7 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-emulation/lxc/files/lxc-1.0.6-bash-completion.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/files/lxc-1.0.6-bash-completion.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/files/lxc-1.0.6-bash-completion.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: lxc-1.0.6-bash-completion.patch |
| 16 |
=================================================================== |
| 17 |
config/bash/Makefile.am | 8 ++++---- |
| 18 |
config/bash/lxc.in | 2 -- |
| 19 |
2 files changed, 4 insertions(+), 6 deletions(-) |
| 20 |
|
| 21 |
diff --git a/config/bash/Makefile.am b/config/bash/Makefile.am |
| 22 |
index b1768c9..3fbbe8e 100644 |
| 23 |
--- a/config/bash/Makefile.am |
| 24 |
+++ b/config/bash/Makefile.am |
| 25 |
@@ -2,12 +2,12 @@ EXTRA_DIST = lxc |
| 26 |
|
| 27 |
if ENABLE_BASH |
| 28 |
install-bash: |
| 29 |
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/ |
| 30 |
- $(INSTALL_DATA) lxc $(DESTDIR)$(sysconfdir)/bash_completion.d/ |
| 31 |
+ $(MKDIR_P) $(DESTDIR)$(datarootdir)/bash-completion/completions/ |
| 32 |
+ $(INSTALL_DATA) lxc $(DESTDIR)$(datarootdir)/bash-completion/completions/ |
| 33 |
|
| 34 |
uninstall-bash: |
| 35 |
- rm -f $(DESTDIR)$(sysconfdir)/bash_completion.d/lxc |
| 36 |
- rmdir $(DESTDIR)$(sysconfdir)/bash_completion.d/ || : |
| 37 |
+ rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/lxc |
| 38 |
+ rmdir $(DESTDIR)$(datarootdir)/bash-completion/ || : |
| 39 |
|
| 40 |
install-data-local: install-bash |
| 41 |
uninstall-local: uninstall-bash |
| 42 |
diff --git a/config/bash/lxc.in b/config/bash/lxc.in |
| 43 |
index 18fd48f..8fff725 100644 |
| 44 |
--- a/config/bash/lxc.in |
| 45 |
+++ b/config/bash/lxc.in |
| 46 |
@@ -1,4 +1,3 @@ |
| 47 |
-have lxc-start && { |
| 48 |
_lxc_names() { |
| 49 |
COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) ) |
| 50 |
} |
| 51 |
@@ -100,4 +99,3 @@ have lxc-start && { |
| 52 |
|
| 53 |
complete -o default -F _lxc-generic-o lxc-clone |
| 54 |
complete -o default -F _lxc-generic-o lxc-start-ephemeral |
| 55 |
-} |
Archives