[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [sandbox PATCH 03/15] Move virt-sandbox-service bash completion script to default directory.



bash_completion scripts have added a new way to do completions, where you
place you scripts in /usr/share/bash_completion/completions rather then
/etc/bash_completions.d.

We should follow the new standard, and this patch moves our bash_completion
script to the proper location with the proper name.
---
 bin/Makefile.am | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 69af01e..1942dab 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -5,14 +5,14 @@ libexec_PROGRAMS = virt-sandbox-service-util
 
 bin_SCRIPTS = virt-sandbox-service
 
-virtsandboxcompdir = $(sysconfdir)/bash_completion.d/
-virtsandboxcomp_DATA = virt-sandbox-service-bash-completion.sh
+virtsandboxcompdir = $(datarootdir)/bash-completion/completions/
 
 crondailydir = $(sysconfdir)/cron.daily
 crondaily_SCRIPTS = virt-sandbox-service.logrotate
 
 POD_FILES = virt-sandbox-service.pod virt-sandbox-service-execute.pod virt-sandbox-service-create.pod virt-sandbox-service-clone.pod virt-sandbox-service-connect.pod virt-sandbox-service-delete.pod virt-sandbox-service-start.pod virt-sandbox-service-stop.pod virt-sandbox-service-reload.pod virt-sandbox-service-list.pod
 EXTRA_DIST = $(bin_SCRIPTS) $(POD_FILES) virt-sandbox-service-bash-completion.sh virt-sandbox-service.logrotate
+EXTRA_DIST += virt-sandbox-service-bash-completion.sh
 
 man1_MANS = virt-sandbox.1 virt-sandbox-service.1 virt-sandbox-service-execute.1 virt-sandbox-service-create.1 virt-sandbox-service-clone.1 virt-sandbox-service-connect.1 virt-sandbox-service-delete.1 virt-sandbox-service-start.1 virt-sandbox-service-stop.1 virt-sandbox-service-reload.1 virt-sandbox-service-list.1
 
@@ -84,7 +84,10 @@ virt_sandbox_service_util_LDFLAGS = \
 
 install-data-local:
 		$(MKDIR_P) $(DESTDIR)$(sysconfdir)/libvirt-sandbox/services
+		$(MKDIR_P) $(DESTDIR)$(virtsandboxcompdir)
+		cp virt-sandbox-service-bash-completion.sh $(DESTDIR)$(virtsandboxcompdir)/virt-sandbox-service
 
 uninstall-local:
 		$(rmdir) $(DESTDIR)$(sysconfdir)/libvirt-sandbox/services ||:
 		$(rmdir) $(DESTDIR)$(sysconfdir)/libvirt-sandbox ||:
+		rm -f $(DESTDIR)$(virtsandboxcompdir)/virt-sandbox-service
-- 
1.8.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]