diff --git a/tools/hadolint/Dockerfile.template b/tools/hadolint/Dockerfile.template index cf3656f1d..732e8823e 100644 --- a/tools/hadolint/Dockerfile.template +++ b/tools/hadolint/Dockerfile.template @@ -9,7 +9,7 @@ ARG name ARG version RUN <"${prefix}${target}/share/bash-completion/completions/havener" -"${prefix}${target}/bin/havener" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/havener.fish" -"${prefix}${target}/bin/havener" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_havener" +"${prefix}/bin/havener" completion bash >"${prefix}/share/bash-completion/completions/havener" +"${prefix}/bin/havener" completion fish >"${prefix}/share/fish/vendor_completions.d/havener.fish" +"${prefix}/bin/havener" completion zsh >"${prefix}/share/zsh/vendor-completions/_havener" EOF \ No newline at end of file diff --git a/tools/hcloud/Dockerfile.template b/tools/hcloud/Dockerfile.template index f0c84b31a..881dce7fa 100644 --- a/tools/hcloud/Dockerfile.template +++ b/tools/hcloud/Dockerfile.template @@ -10,9 +10,9 @@ ARG version RUN <"${prefix}${target}/share/bash-completion/completions/hcloud" -"${prefix}${target}/bin/hcloud" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/hcloud.fish" -"${prefix}${target}/bin/hcloud" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_hcloud" +"${prefix}/bin/hcloud" completion bash >"${prefix}/share/bash-completion/completions/hcloud" +"${prefix}/bin/hcloud" completion fish >"${prefix}/share/fish/vendor_completions.d/hcloud.fish" +"${prefix}/bin/hcloud" completion zsh >"${prefix}/share/zsh/vendor-completions/_hcloud" EOF \ No newline at end of file diff --git a/tools/helm-plugins/Dockerfile.template b/tools/helm-plugins/Dockerfile.template index d59b90fce..ed43df19f 100644 --- a/tools/helm-plugins/Dockerfile.template +++ b/tools/helm-plugins/Dockerfile.template @@ -11,9 +11,9 @@ ARG name ARG version COPY --link --from=helm / / RUN <"${prefix}${target}/etc/profile.d/helm-plugins.sh" +echo "export HELM_PLUGINS=/share/helm/plugins" >"${prefix}/etc/profile.d/helm-plugins.sh" -export HELM_PLUGINS=${prefix}${target}/share/helm/plugins +export HELM_PLUGINS=${prefix}/share/helm/plugins plugins=( https://github.com/mstrzele/helm-edit @@ -52,11 +52,11 @@ for url in "${plugins[@]}"; do "${HELM_PLUGINS}/${name}/*.md" done -helm diff completion bash >"${prefix}${target}/share/bash-completion/completions/helm-diff" -helm diff completion fish >"${prefix}${target}/share/fish/vendor_completions.d/helm-diff.fish" -helm diff completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_helm-diff" +helm diff completion bash >"${prefix}/share/bash-completion/completions/helm-diff" +helm diff completion fish >"${prefix}/share/fish/vendor_completions.d/helm-diff.fish" +helm diff completion zsh >"${prefix}/share/zsh/vendor-completions/_helm-diff" -helm sigstore completion bash >"${prefix}${target}/share/bash-completion/completions/helm-sigstore" -helm sigstore completion fish >"${prefix}${target}/share/fish/vendor_completions.d/helm-sigstore.fish" -helm sigstore completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_helm-sigstore" +helm sigstore completion bash >"${prefix}/share/bash-completion/completions/helm-sigstore" +helm sigstore completion fish >"${prefix}/share/fish/vendor_completions.d/helm-sigstore.fish" +helm sigstore completion zsh >"${prefix}/share/zsh/vendor-completions/_helm-sigstore" EOF \ No newline at end of file diff --git a/tools/helm/Dockerfile.template b/tools/helm/Dockerfile.template index 6112e7ba2..ab78378a6 100644 --- a/tools/helm/Dockerfile.template +++ b/tools/helm/Dockerfile.template @@ -9,9 +9,9 @@ ARG name ARG version RUN <"${prefix}${target}/share/bash-completion/completions/helm" -"${prefix}${target}/bin/helm" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/helm.fish" -"${prefix}${target}/bin/helm" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_helm" +"${prefix}/bin/helm" completion bash >"${prefix}/share/bash-completion/completions/helm" +"${prefix}/bin/helm" completion fish >"${prefix}/share/fish/vendor_completions.d/helm.fish" +"${prefix}/bin/helm" completion zsh >"${prefix}/share/zsh/vendor-completions/_helm" EOF diff --git a/tools/helmfile/Dockerfile.template b/tools/helmfile/Dockerfile.template index 811b42bd8..77a652e73 100644 --- a/tools/helmfile/Dockerfile.template +++ b/tools/helmfile/Dockerfile.template @@ -11,11 +11,11 @@ ARG version RUN <"${prefix}${target}/share/bash-completion/completions/foo" -#"${prefix}${target}/bin/foo" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/foo.fish" -#"${prefix}${target}/bin/foo" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_foo" +#"${prefix}/bin/foo" completion bash >"${prefix}/share/bash-completion/completions/foo" +#"${prefix}/bin/foo" completion fish >"${prefix}/share/fish/vendor_completions.d/foo.fish" +#"${prefix}/bin/foo" completion zsh >"${prefix}/share/zsh/vendor-completions/_foo" #EOF \ No newline at end of file diff --git a/tools/hexyl/Dockerfile.template b/tools/hexyl/Dockerfile.template index a93042b51..aef2a4763 100644 --- a/tools/hexyl/Dockerfile.template +++ b/tools/hexyl/Dockerfile.template @@ -25,9 +25,9 @@ check-github-release-asset "sharkdp/hexyl" "v${version}" "hexyl-v${version}-${ar echo "### Downloading hexyl ${version}" curl --silent --location --fail "https://github.com/sharkdp/hexyl/releases/download/v${version}/hexyl-v${version}-${arch}-unknown-linux-${suffix}.tar.gz" \ -| tar --extract --gzip --directory="${prefix}${target}/bin/" --strip-components=1 --no-same-owner \ +| tar --extract --gzip --directory="${prefix}/bin/" --strip-components=1 --no-same-owner \ "hexyl-v${version}-${arch}-unknown-linux-${suffix}/hexyl" \ "hexyl-v${version}-${arch}-unknown-linux-${suffix}/hexyl.1" -mv "${prefix}${target}/bin/hexyl.1" "${prefix}${target}/share/man/man1/" +mv "${prefix}/bin/hexyl.1" "${prefix}/share/man/man1/" EOF \ No newline at end of file diff --git a/tools/htmx/Dockerfile.template b/tools/htmx/Dockerfile.template index a8af3429f..d5ad3ae9a 100644 --- a/tools/htmx/Dockerfile.template +++ b/tools/htmx/Dockerfile.template @@ -9,7 +9,7 @@ ARG name ARG version RUN <"${prefix}${target}/share/bash-completion/completions/hubble" -"${prefix}${target}/bin/hubble" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/hubble.fish" -"${prefix}${target}/bin/hubble" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_hubble" +| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner +"${prefix}/bin/hubble" completion bash >"${prefix}/share/bash-completion/completions/hubble" +"${prefix}/bin/hubble" completion fish >"${prefix}/share/fish/vendor_completions.d/hubble.fish" +"${prefix}/bin/hubble" completion zsh >"${prefix}/share/zsh/vendor-completions/_hubble" EOF \ No newline at end of file diff --git a/tools/huber/Dockerfile.template b/tools/huber/Dockerfile.template index e70ec2a73..13553d8e7 100644 --- a/tools/huber/Dockerfile.template +++ b/tools/huber/Dockerfile.template @@ -26,9 +26,9 @@ apt-get -y install --no-install-recommends \ pkg-config EOF RUN <"${prefix}${target}/share/bash-completion/completions/hugo" -"${prefix}${target}/bin/hugo" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/hugo.fish" -"${prefix}${target}/bin/hugo" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_hugo" +"${prefix}/bin/hugo" gen man --dir "${prefix}/share/man/man1" +"${prefix}/bin/hugo" completion bash >"${prefix}/share/bash-completion/completions/hugo" +"${prefix}/bin/hugo" completion fish >"${prefix}/share/fish/vendor_completions.d/hugo.fish" +"${prefix}/bin/hugo" completion zsh >"${prefix}/share/zsh/vendor-completions/_hugo" EOF \ No newline at end of file diff --git a/tools/hurl/Dockerfile.template b/tools/hurl/Dockerfile.template index 4df5e8aef..bb3750ae2 100644 --- a/tools/hurl/Dockerfile.template +++ b/tools/hurl/Dockerfile.template @@ -10,9 +10,9 @@ ARG version RUN <