[packages/docker-ce: 6/7] bash/zsh completions moved to cli
glen
glen at pld-linux.org
Tue Aug 29 21:14:24 CEST 2017
commit b9423c2b492fd4ef589ed6e57f0914e2bdc02933
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Tue Aug 29 22:04:15 2017 +0300
bash/zsh completions moved to cli
https://github.com/moby/moby/pull/33665
https://github.com/moby/moby/pull/33801
docker-ce.spec | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/docker-ce.spec b/docker-ce.spec
index 19c708b..60afd70 100644
--- a/docker-ce.spec
+++ b/docker-ce.spec
@@ -254,12 +254,6 @@ cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/docker
install -d $RPM_BUILD_ROOT/lib/udev/rules.d
cp -p contrib/udev/80-docker.rules $RPM_BUILD_ROOT/lib/udev/rules.d
-# bash and zsh completion
-install -d $RPM_BUILD_ROOT%{bash_compdir}
-cp -p contrib/completion/bash/docker $RPM_BUILD_ROOT%{bash_compdir}/docker
-install -d $RPM_BUILD_ROOT%{zsh_compdir}
-cp -p contrib/completion/zsh/_docker $RPM_BUILD_ROOT%{zsh_compdir}
-
# vim syntax
%if %{with vim}
install -d $RPM_BUILD_ROOT%{_vimdatadir}
@@ -267,6 +261,13 @@ cp -a contrib/syntax/vim/* $RPM_BUILD_ROOT%{_vimdatadir}
%{__rm} $RPM_BUILD_ROOT%{_vimdatadir}/{LICENSE,README.md}
%endif
+# bash and zsh completion
+cd ../cli/contrib/completion
+install -d $RPM_BUILD_ROOT%{bash_compdir}
+cp -p bash/docker $RPM_BUILD_ROOT%{bash_compdir}
+install -d $RPM_BUILD_ROOT%{zsh_compdir}
+cp -p zsh/_docker $RPM_BUILD_ROOT%{zsh_compdir}
+
%pre
%groupadd -g 296 docker
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/docker-ce.git/commitdiff/902914c7c366b62040f592610ffa78c33cdda8d2
More information about the pld-cvs-commit
mailing list