From 45ddb5a6b4923f090358854643595a872f2f97c7 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 22 Jun 2017 01:55:38 -0700 Subject: [PATCH] Fix paths for completion scripts The completion scripts have been moved to the docker/cli repository, so should be taken from that directory. Signed-off-by: Sebastiaan van Stijn Upstream-commit: e1902e55b76203dd8a5b5ff8249ff750ab365b96 Component: packaging --- components/packaging/deb/common/docker-ce.bash-completion | 2 +- components/packaging/deb/common/docker-ce.install | 4 ++-- components/packaging/rpm/centos-7/docker-ce.spec | 6 +++--- components/packaging/rpm/fedora-24/docker-ce.spec | 6 +++--- components/packaging/rpm/fedora-25/docker-ce.spec | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/components/packaging/deb/common/docker-ce.bash-completion b/components/packaging/deb/common/docker-ce.bash-completion index 15079d751d..009937f56f 100644 --- a/components/packaging/deb/common/docker-ce.bash-completion +++ b/components/packaging/deb/common/docker-ce.bash-completion @@ -1 +1 @@ -engine/contrib/completion/bash/docker +cli/contrib/completion/bash/docker diff --git a/components/packaging/deb/common/docker-ce.install b/components/packaging/deb/common/docker-ce.install index 90d0b29179..c5c6a1abd6 100644 --- a/components/packaging/deb/common/docker-ce.install +++ b/components/packaging/deb/common/docker-ce.install @@ -3,8 +3,8 @@ #engine/contrib/syntax/vim/syntax/* /usr/share/vim/vimfiles/syntax/ engine/contrib/*-integration usr/share/docker-ce/contrib/ engine/contrib/check-config.sh usr/share/docker-ce/contrib/ -engine/contrib/completion/fish/docker.fish usr/share/fish/vendor_completions.d/ -engine/contrib/completion/zsh/_docker usr/share/zsh/vendor-completions/ +cli/contrib/completion/fish/docker.fish usr/share/fish/vendor_completions.d/ +cli/contrib/completion/zsh/_docker usr/share/zsh/vendor-completions/ systemd/docker.service lib/systemd/system/ systemd/docker.socket lib/systemd/system/ engine/contrib/mk* usr/share/docker-ce/contrib/ diff --git a/components/packaging/rpm/centos-7/docker-ce.spec b/components/packaging/rpm/centos-7/docker-ce.spec index c04be0a07c..f6278fa915 100644 --- a/components/packaging/rpm/centos-7/docker-ce.spec +++ b/components/packaging/rpm/centos-7/docker-ce.spec @@ -106,9 +106,9 @@ install -p -m 644 /systemd/docker.service $RPM_BUILD_ROOT/%{_unitdir}/docker.ser install -d $RPM_BUILD_ROOT/usr/share/bash-completion/completions install -d $RPM_BUILD_ROOT/usr/share/zsh/vendor-completions install -d $RPM_BUILD_ROOT/usr/share/fish/vendor_completions.d -install -p -m 644 engine/contrib/completion/bash/docker $RPM_BUILD_ROOT/usr/share/bash-completion/completions/docker -install -p -m 644 engine/contrib/completion/zsh/_docker $RPM_BUILD_ROOT/usr/share/zsh/vendor-completions/_docker -install -p -m 644 engine/contrib/completion/fish/docker.fish $RPM_BUILD_ROOT/usr/share/fish/vendor_completions.d/docker.fish +install -p -m 644 cli/contrib/completion/bash/docker $RPM_BUILD_ROOT/usr/share/bash-completion/completions/docker +install -p -m 644 cli/contrib/completion/zsh/_docker $RPM_BUILD_ROOT/usr/share/zsh/vendor-completions/_docker +install -p -m 644 cli/contrib/completion/fish/docker.fish $RPM_BUILD_ROOT/usr/share/fish/vendor_completions.d/docker.fish # install manpages install -d %{buildroot}%{_mandir}/man1 diff --git a/components/packaging/rpm/fedora-24/docker-ce.spec b/components/packaging/rpm/fedora-24/docker-ce.spec index 4f6694c37b..841c2b6a04 100644 --- a/components/packaging/rpm/fedora-24/docker-ce.spec +++ b/components/packaging/rpm/fedora-24/docker-ce.spec @@ -107,9 +107,9 @@ install -p -m 644 /systemd/docker.service $RPM_BUILD_ROOT/%{_unitdir}/docker.ser install -d $RPM_BUILD_ROOT/usr/share/bash-completion/completions install -d $RPM_BUILD_ROOT/usr/share/zsh/vendor-completions install -d $RPM_BUILD_ROOT/usr/share/fish/vendor_completions.d -install -p -m 644 engine/contrib/completion/bash/docker $RPM_BUILD_ROOT/usr/share/bash-completion/completions/docker -install -p -m 644 engine/contrib/completion/zsh/_docker $RPM_BUILD_ROOT/usr/share/zsh/vendor-completions/_docker -install -p -m 644 engine/contrib/completion/fish/docker.fish $RPM_BUILD_ROOT/usr/share/fish/vendor_completions.d/docker.fish +install -p -m 644 cli/contrib/completion/bash/docker $RPM_BUILD_ROOT/usr/share/bash-completion/completions/docker +install -p -m 644 cli/contrib/completion/zsh/_docker $RPM_BUILD_ROOT/usr/share/zsh/vendor-completions/_docker +install -p -m 644 cli/contrib/completion/fish/docker.fish $RPM_BUILD_ROOT/usr/share/fish/vendor_completions.d/docker.fish # install manpages install -d %{buildroot}%{_mandir}/man1 diff --git a/components/packaging/rpm/fedora-25/docker-ce.spec b/components/packaging/rpm/fedora-25/docker-ce.spec index f85e9214b9..3eaae94b95 100644 --- a/components/packaging/rpm/fedora-25/docker-ce.spec +++ b/components/packaging/rpm/fedora-25/docker-ce.spec @@ -105,9 +105,9 @@ install -p -m 644 /systemd/docker.service $RPM_BUILD_ROOT/%{_unitdir}/docker.ser install -d $RPM_BUILD_ROOT/usr/share/bash-completion/completions install -d $RPM_BUILD_ROOT/usr/share/zsh/vendor-completions install -d $RPM_BUILD_ROOT/usr/share/fish/vendor_completions.d -install -p -m 644 engine/contrib/completion/bash/docker $RPM_BUILD_ROOT/usr/share/bash-completion/completions/docker -install -p -m 644 engine/contrib/completion/zsh/_docker $RPM_BUILD_ROOT/usr/share/zsh/vendor-completions/_docker -install -p -m 644 engine/contrib/completion/fish/docker.fish $RPM_BUILD_ROOT/usr/share/fish/vendor_completions.d/docker.fish +install -p -m 644 cli/contrib/completion/bash/docker $RPM_BUILD_ROOT/usr/share/bash-completion/completions/docker +install -p -m 644 cli/contrib/completion/zsh/_docker $RPM_BUILD_ROOT/usr/share/zsh/vendor-completions/_docker +install -p -m 644 cli/contrib/completion/fish/docker.fish $RPM_BUILD_ROOT/usr/share/fish/vendor_completions.d/docker.fish # install manpages install -d %{buildroot}%{_mandir}/man1