WIP: try alternative path

Signed-off-by: Sebastiaan van Stijn <[email protected]>
docker · Jan 24, 2025 · d4c7323 · d4c7323
1 parent 27dcc95
commit d4c7323
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/deb/common/rules b/deb/common/rules
@@ -28,9 +28,9 @@ override_dh_auto_build:
 	# Build the CLI
 	cd /go/src/github.com/docker/cli \
 		&& make DISABLE_WARN_OUTSIDE_CONTAINER=1 VERSION=$(VERSION) GITCOMMIT=$(CLI_GITCOMMIT) LDFLAGS='' dynbinary manpages \
-		&& build/docker completion bash > contrib/completion/bash/docker \
-		&& build/docker completion zsh > contrib/completion/zsh/_docker \
-		&& build/docker completion fish > contrib/completion/fish/docker.fish
+		&& build/docker completion bash | install -D /dev/stdin build/completion/bash/docker \
+		&& build/docker completion zsh | install -D /dev/stdin build/completion/zsh/_docker \
+		&& build/docker completion fish | install -D /dev/stdin build/completion/fish/docker.fish
 
 	# Build buildx plugin
 	cd /go/src/github.com/docker/buildx \
@@ -103,9 +103,9 @@ override_dh_auto_install:
 	# [1]: https://manpages.debian.org/bookworm/bash-completion/dh_bash-completion.1.en.html
 	# [2]: https://manpages.debian.org/testing/dh-shell-completions/dh_shell_completions.1.en.html
 	# [3]: https://github.com/PowerShell/PowerShell/issues/17582
-	install -D -p -m 0644 cli/contrib/completion/bash/docker debian/docker-ce-cli/usr/share/bash-completion/completions/docker
-	install -D -p -m 0644 cli/contrib/completion/fish/docker.fish debian/docker-ce-cli/usr/share/fish/vendor_completions.d/docker.fish
-	install -D -p -m 0644 cli/contrib/completion/zsh/_docker debian/docker-ce-cli/usr/share/zsh/vendor-completions/_docker
+	install -D -p -m 0644 cli/build/completion/bash/docker debian/docker-ce-cli/usr/share/bash-completion/completions/docker
+	install -D -p -m 0644 cli/build/completion/fish/docker.fish debian/docker-ce-cli/usr/share/fish/vendor_completions.d/docker.fish
+	install -D -p -m 0644 cli/build/completion/zsh/_docker debian/docker-ce-cli/usr/share/zsh/vendor-completions/_docker
 
 	# docker-ce install
 	install -D -p -m 0755 $(shell readlink -e engine/bundles/dynbinary-daemon/dockerd) debian/docker-ce/usr/bin/dockerd

diff --git a/rpm/SPECS/docker-ce-cli.spec b/rpm/SPECS/docker-ce-cli.spec
@@ -49,9 +49,9 @@ rm -f /go/src/github.com/docker/cli
 ln -snf ${RPM_BUILD_DIR}/src/cli /go/src/github.com/docker/cli
 pushd /go/src/github.com/docker/cli
 make DISABLE_WARN_OUTSIDE_CONTAINER=1 VERSION=%{_origversion} GITCOMMIT=%{_gitcommit_cli} dynbinary manpages
-build/docker completion bash > contrib/completion/bash/docker
-build/docker completion zsh > contrib/completion/zsh/_docker
-build/docker completion fish > contrib/completion/fish/docker.fish
+build/docker completion bash | install -D /dev/stdin build/completion/bash/docker
+build/docker completion zsh | install -D /dev/stdin build/completion/zsh/_docker
+build/docker completion fish | install -D /dev/stdin build/completion/fish/docker.fish
 popd
 
 %check
@@ -63,9 +63,9 @@ ver="$(cli/build/docker --version)"; \
 install -D -p -m 755 cli/build/docker ${RPM_BUILD_ROOT}%{_bindir}/docker
 
 # add bash, zsh, and fish completions
-install -D -p -m 644 cli/contrib/completion/bash/docker ${RPM_BUILD_ROOT}%{_datadir}/bash-completion/completions/docker
-install -D -p -m 644 cli/contrib/completion/zsh/_docker ${RPM_BUILD_ROOT}%{_datadir}/zsh/vendor-completions/_docker
-install -D -p -m 644 cli/contrib/completion/fish/docker.fish ${RPM_BUILD_ROOT}%{_datadir}/fish/vendor_completions.d/docker.fish
+install -D -p -m 644 cli/build/completion/bash/docker ${RPM_BUILD_ROOT}%{_datadir}/bash-completion/completions/docker
+install -D -p -m 644 cli/build/completion/zsh/_docker ${RPM_BUILD_ROOT}%{_datadir}/zsh/vendor-completions/_docker
+install -D -p -m 644 cli/build/completion/fish/docker.fish ${RPM_BUILD_ROOT}%{_datadir}/fish/vendor_completions.d/docker.fish
 
 # install manpages
 # Note: we need to create destination dirs first (instead "install -D") due to wildcards used.