Files in the bash-completion dirs should be named like the commands,
without suffix. Without this change 'xl' will not be recognized as a
command with completion support if BASH_COMPLETION_DIR is set to
/usr/share/bash-completion/completions.
Fixes commit 9136a919b19929ecb242ef327053d55d824397df
Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
tools/xl/Makefile | 4 ++--
tools/xl/bash-completion | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/xl/Makefile b/tools/xl/Makefile
index bdf67c8464..656b21c7da 100644
--- a/tools/xl/Makefile
+++ b/tools/xl/Makefile
@@ -45,11 +45,11 @@ install: all
$(INSTALL_DIR) $(DESTDIR)$(sbindir)
$(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR)
$(INSTALL_PROG) xl $(DESTDIR)$(sbindir)
- $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh
+ $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl
.PHONY: uninstall
uninstall:
- rm -f $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh
+ rm -f $(DESTDIR)$(BASH_COMPLETION_DIR)/xl
rm -f $(DESTDIR)$(sbindir)/xl
.PHONY: clean
diff --git a/tools/xl/bash-completion b/tools/xl/bash-completion
index b7cd6b3992..7c6ed32f88 100644
--- a/tools/xl/bash-completion
+++ b/tools/xl/bash-completion
@@ -1,4 +1,4 @@
-# Copy this file to /etc/bash_completion.d/xl.sh
+# Copy this file to /etc/bash_completion.d/xl
_xl()
{
On 20/10/2020 13:39, Olaf Hering wrote: > Files in the bash-completion dirs should be named like the commands, > without suffix. Without this change 'xl' will not be recognized as a > command with completion support if BASH_COMPLETION_DIR is set to > /usr/share/bash-completion/completions. > > Fixes commit 9136a919b19929ecb242ef327053d55d824397df > > Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com> This obviously fell through the cracks, but definitely matches how systems are typically set up. > --- > tools/xl/Makefile | 4 ++-- > tools/xl/bash-completion | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tools/xl/Makefile b/tools/xl/Makefile > index bdf67c8464..656b21c7da 100644 > --- a/tools/xl/Makefile > +++ b/tools/xl/Makefile > @@ -45,11 +45,11 @@ install: all > $(INSTALL_DIR) $(DESTDIR)$(sbindir) > $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) > $(INSTALL_PROG) xl $(DESTDIR)$(sbindir) > - $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh > + $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl > > .PHONY: uninstall > uninstall: > - rm -f $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh > + rm -f $(DESTDIR)$(BASH_COMPLETION_DIR)/xl > rm -f $(DESTDIR)$(sbindir)/xl > > .PHONY: clean > diff --git a/tools/xl/bash-completion b/tools/xl/bash-completion > index b7cd6b3992..7c6ed32f88 100644 > --- a/tools/xl/bash-completion > +++ b/tools/xl/bash-completion > @@ -1,4 +1,4 @@ > -# Copy this file to /etc/bash_completion.d/xl.sh > +# Copy this file to /etc/bash_completion.d/xl > > _xl() > { >
Andrew Cooper writes ("Re: [PATCH v1] xl: use proper name for bash_completion file"): > On 20/10/2020 13:39, Olaf Hering wrote: > > Files in the bash-completion dirs should be named like the commands, > > without suffix. Without this change 'xl' will not be recognized as a > > command with completion support if BASH_COMPLETION_DIR is set to > > /usr/share/bash-completion/completions. > > > > Fixes commit 9136a919b19929ecb242ef327053d55d824397df > > > > Signed-off-by: Olaf Hering <olaf@aepfle.de> > > Acked-by: Andrew Cooper <andrew.cooper3@citrix.com> > > This obviously fell through the cracks, but definitely matches how > systems are typically set up. Technically speaking this might need a release-ack as it's enabling a feature that was previously defeated by a bug. I think it's fine at this stage, so: Release-Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Ian.
© 2016 - 2024 Red Hat, Inc.