File xen.bb9afb7a465d3b7b438f2e11105409d24400f8f4.patch of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File xen.bb9afb7a465d3b7b438f2e11105409d24400f8f4.patch of Package xen

From: Olaf Hering <olaf@aepfle.de>
Date: Tue, 20 Oct 2020 14:39:28 +0200
Subject: bb9afb7a465d3b7b438f2e11105409d24400f8f4

tools/xl: use proper name for bash_completion file

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: 9136a919b ("xl: Add basic bash completion for xl command.")
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
Release-Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 tools/xl/Makefile        | 4 ++--
 tools/xl/bash-completion | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- a/tools/xl/Makefile
+++ b/tools/xl/Makefile
@@ -35,27 +35,27 @@ $(XL_OBJS): _paths.h
 
 .PHONY: all
 all: xl
 
 xl: $(XL_OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(XL_OBJS) $(LDLIBS_libxlutil) $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -lyajl $(APPEND_LDFLAGS)
 
 .PHONY: install
 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
 clean:
 	$(RM) -f *.o xl _paths.h $(DEPS_RM)
 
 distclean: clean
 
 
 -include $(DEPS_INCLUDE)
--- a/tools/xl/bash-completion
+++ b/tools/xl/bash-completion
@@ -1,13 +1,13 @@
-# Copy this file to /etc/bash_completion.d/xl.sh
+# Copy this file to /etc/bash_completion.d/xl
 
 _xl()
 {
 	local IFS=$'\n,'
 
 	local cur opts xl
 	COMPREPLY=()
 	cur="${COMP_WORDS[COMP_CWORD]}"
 	xl=xl
 
 	if [[ $COMP_CWORD == 1 ]] ; then
 		opts=`${xl} help 2>/dev/null | sed '1,4d' | awk '/^ [^ ]/ {print $1}' | sed 's/$/ ,/g'` && COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )

Places

File xen.bb9afb7a465d3b7b438f2e11105409d24400f8f4.patch of Package xen

Places