summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPaul Holzinger <paul.holzinger@web.de>2020-12-01 12:32:27 +0100
committerPaul Holzinger <paul.holzinger@web.de>2020-12-01 14:15:18 +0100
commit3d4a0e42b3ef1f36d7bdfd211ad0e8cb43b242e6 (patch)
treea967a31d9c708a80d6aefa84fb1389dc94b4f446 /Makefile
parentca612a3407eeecfedc38b629731f1e7a0105020f (diff)
downloadpodman-3d4a0e42b3ef1f36d7bdfd211ad0e8cb43b242e6.tar.gz
podman-3d4a0e42b3ef1f36d7bdfd211ad0e8cb43b242e6.tar.bz2
podman-3d4a0e42b3ef1f36d7bdfd211ad0e8cb43b242e6.zip
Revert the custom cobra vendor
Vendor in the latest cobra release v1.1.1 This will hurt the completion experience but is required for proper packaging, see: #8528. The best solution is to keep the current scripts since they work fine with cobra v1.1.1. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile17
1 files changed, 0 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index 8785afc20..0316ea284 100644
--- a/Makefile
+++ b/Makefile
@@ -475,15 +475,6 @@ changelog: ## Generate changelog
$(shell cat $(TMPFILE) >> changelog.txt)
$(shell rm $(TMPFILE))
-completions: binaries
- install ${SELINUXOPT} -d -m 755 completions/{bash,zsh,fish}
- ./bin/podman completion bash --no-desc -f completions/bash/podman
- ./bin/podman-remote completion bash --no-desc -f completions/bash/podman-remote
- ./bin/podman completion zsh -f completions/zsh/_podman
- ./bin/podman-remote completion zsh -f completions/zsh/_podman-remote
- ./bin/podman completion fish -f completions/fish/podman.fish
- ./bin/podman-remote completion fish -f completions/fish/podman-remote.fish
-
.PHONY: install
install: .gopathok install.bin install.remote install.man install.cni install.systemd ## Install binaries to system locations
@@ -673,14 +664,6 @@ API.md: pkg/varlink/io.podman.varlink
.PHONY: validate.completions
validate.completions: SHELL:=/usr/bin/env bash # Set shell to bash for this target
validate.completions:
- # Check that nobody has manually edited the completion scripts
- # If this check fails run make completions to restore the correct scripts
- diff completions/bash/podman <(./bin/podman completion --no-desc bash)
- diff completions/zsh/_podman <(./bin/podman completion zsh)
- diff completions/fish/podman.fish <(./bin/podman completion fish)
- diff completions/bash/podman-remote <(./bin/podman-remote completion --no-desc bash)
- diff completions/zsh/_podman-remote <(./bin/podman-remote completion zsh)
- diff completions/fish/podman-remote.fish <(./bin/podman-remote completion fish)
# Check if the files can be loaded by the shell
. completions/bash/podman
if [ -x /bin/zsh ]; then /bin/zsh completions/zsh/_podman; fi