Improved readability again #2983

Author: nicholasdille

tools/act/Dockerfile.template

@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sL "https://github.com/nektos/act/releases/download/v${version}/act_Linux_${arch}.tar.gz" \
+curl --silent --location "https://github.com/nektos/act/releases/download/v${version}/act_Linux_${arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
     act
 EOF

tools/arkade/Dockerfile.template

@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sLo "${prefix}${target}/bin/arkade" "https://github.com/alexellis/arkade/releases/download/${version}/arkade"
+curl --silent --location --output "${prefix}${target}/bin/arkade" "https://github.com/alexellis/arkade/releases/download/${version}/arkade"
 chmod +x "${prefix}${target}/bin/arkade"
 "${prefix}${target}/bin/arkade" completion bash >"${prefix}${target}/share/bash-completion/completions/arkade"
 "${prefix}${target}/bin/arkade" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/arkade.fish"

tools/artifactory-cleanup/Dockerfile.template

@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sL "https://github.com/crazy-max/artifactory-cleanup/releases/download/v${version}/artifactory-cleanup_${version}_linux_${alt_arch}.tar.gz" \
+curl --silent --location "https://github.com/crazy-max/artifactory-cleanup/releases/download/v${version}/artifactory-cleanup_${version}_linux_${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
     artifactory-cleanup
 EOF

tools/bin/Dockerfile.template

@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sLo "${prefix}${target}/bin/bin" \
+curl --silent --location --output "${prefix}${target}/bin/bin" \
     "https://github.com/marcosnils/bin/releases/download/v${version}/bin_${version}_Linux_${arch}"
 chmod +x "${prefix}${target}/bin/bin"
 EOF

tools/buildah/Dockerfile.template

@@ -7,6 +7,6 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sL "https://github.com/nicholasdille/buildah-static/releases/download/v${version}/buildah-${alt_arch}.tar.gz" \
+curl --silent --location "https://github.com/nicholasdille/buildah-static/releases/download/v${version}/buildah-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}" --no-same-owner
 EOF

tools/buildg/Dockerfile.template

@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sL "https://github.com/ktock/buildg/releases/download/v${version}/buildg-v${version}-linux-${alt_arch}.tar.gz" \
+curl --silent --location "https://github.com/ktock/buildg/releases/download/v${version}/buildg-v${version}-linux-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
     ./buildg \
     ./buildg.sh

tools/buildkit/Dockerfile.template

@@ -9,11 +9,11 @@ ARG version
 COPY init-buildkit "${prefix}/etc/init.d/buildkit"
 
 RUN <<EOF
-curl -sL "https://github.com/moby/buildkit/releases/download/v${version}/buildkit-v${version}.linux-${alt_arch}.tar.gz" \
+curl --silent --location "https://github.com/moby/buildkit/releases/download/v${version}/buildkit-v${version}.linux-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --strip-components=1 --no-same-owner
-curl -sLo "${prefix}/etc/systemd/system/buildkit.service" \
+curl --silent --location --output "${prefix}/etc/systemd/system/buildkit.service" \
     "https://github.com/moby/buildkit/raw/v${version}/examples/systemd/system/buildkit.service"
-curl -sLo "${prefix}/etc/systemd/system/buildkit.socket" \
+curl --silent --location --output "${prefix}/etc/systemd/system/buildkit.socket" \
     "https://github.com/moby/buildkit/raw/v${version}/examples/systemd/system/buildkit.socket"
 chmod +x "${prefix}/etc/init.d/buildkit"
 EOF

tools/buildx/Dockerfile.template

@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sLo "${prefix}${target}/libexec/docker/cli-plugins/docker-buildx" \
+curl --silent --location --output "${prefix}${target}/libexec/docker/cli-plugins/docker-buildx" \
     "https://github.com/docker/buildx/releases/download/v${version}/buildx-v${version}.linux-${alt_arch}"
 chmod +x "${prefix}${target}/libexec/docker/cli-plugins/docker-buildx"
 "${prefix}${target}/libexec/docker/cli-plugins/docker-buildx" completion bash >"${prefix}${target}/share/bash-completion/completions/docker-buildx"

tools/cas/Dockerfile.template

@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sLo "${prefix}${target}/bin/cas" \
+curl --silent --location --output "${prefix}${target}/bin/cas" \
     "https://github.com/codenotary/cas/releases/download/v${version}/cas-v${version}-linux-${alt_arch}-static"
 chmod +x "${prefix}${target}/bin/cas"
 "${prefix}${target}/bin/cas" completion bash >"${prefix}${target}/share/bash-completion/completions/cas"

tools/catatonit/Dockerfile.template

@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sLo "${prefix}${target}/bin/catatonit" \
+curl --silent --location --output "${prefix}${target}/bin/catatonit" \
     "https://github.com/openSUSE/catatonit/releases/download/v${version}/catatonit.${arch}"
 chmod +x "${prefix}${target}/bin/catatonit"
 EOF

tools/cilium/Dockerfile.template

@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sL "https://github.com/cilium/cilium-cli/releases/download/v${version}/cilium-linux-${alt_arch}.tar.gz" \
+curl --silent --location "https://github.com/cilium/cilium-cli/releases/download/v${version}/cilium-linux-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner
 "${prefix}${target}/bin/cilium" completion bash >"${prefix}${target}/share/bash-completion/completions/cilium"
 "${prefix}${target}/bin/cilium" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/cilium.fish"

tools/cinf/Dockerfile.template

@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sL "https://github.com/mhausenblas/cinf/releases/download/v${version}/cinf_linux_${alt_arch}.tar.gz" \
+curl --silent --location "https://github.com/mhausenblas/cinf/releases/download/v${version}/cinf_linux_${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
     cinf
 EOF

tools/clusterawsadm/Dockerfile.template

@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sLo "${prefix}${target}/bin/clusterawsadm" \
+curl --silent --location --output "${prefix}${target}/bin/clusterawsadm" \
     "https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/download/v${version}/clusterawsadm-linux-${alt_arch}"
 chmod +x "${prefix}${target}/bin/clusterawsadm"
 "${prefix}${target}/bin/clusterawsadm" completion bash >"${prefix}${target}/share/bash-completion/completions/clusterawsadm"

tools/clusterctl/Dockerfile.template

@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sLo "${prefix}${target}/bin/clusterctl" \
+curl --silent --location --output "${prefix}${target}/bin/clusterctl" \
     "https://github.com/kubernetes-sigs/cluster-api/releases/download/v${version}/clusterctl-linux-${alt_arch}"
 chmod +x "${prefix}${target}/bin/clusterctl"
 "${prefix}${target}/bin/clusterctl" completion bash >"${prefix}${target}/share/bash-completion/completions/clusterctl"

tools/cmctl/Dockerfile.template

@@ -7,10 +7,10 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sL "https://github.com/cert-manager/cert-manager/releases/download/v${version}/cmctl-linux-${alt_arch}.tar.gz" \
+curl --silent --location "https://github.com/cert-manager/cert-manager/releases/download/v${version}/cmctl-linux-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
     cmctl
-curl -sL "https://github.com/cert-manager/cert-manager/releases/download/v${version}/kubectl-cert_manager-linux-${alt_arch}.tar.gz" \
+curl --silent --location "https://github.com/cert-manager/cert-manager/releases/download/v${version}/kubectl-cert_manager-linux-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
     kubectl-cert_manager
 "${prefix}${target}/bin/cmctl" completion bash >"${prefix}${target}/share/bash-completion/completions/cmctl"

tools/cni/Dockerfile.template

@@ -8,6 +8,6 @@ ARG version
 
 RUN <<EOF
 mkdir -p "${prefix}${target}/libexec/cni"
-curl -sL "https://github.com/containernetworking/plugins/releases/download/v${version}/cni-plugins-linux-${alt_arch}-v${version}.tgz" \
+curl --silent --location "https://github.com/containernetworking/plugins/releases/download/v${version}/cni-plugins-linux-${alt_arch}-v${version}.tgz" \
 | tar --extract --gzip --directory="${prefix}${target}/libexec/cni" --no-same-owner
 EOF

tools/cntr/Dockerfile.template

@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sLo "${prefix}${target}/bin/cntr" \
+curl --silent --location --output "${prefix}${target}/bin/cntr" \
     "https://github.com/Mic92/cntr/releases/download/${version}/cntr-bin-${version}-${arch}-unknown-linux-musl"
 chmod +x "${prefix}${target}/bin/cntr"
 EOF

tools/conftest/Dockerfile.template

@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sL "https://github.com/open-policy-agent/conftest/releases/download/v${version}/conftest_${version}_Linux_${arch}.tar.gz" \
+curl --silent --location "https://github.com/open-policy-agent/conftest/releases/download/v${version}/conftest_${version}_Linux_${arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
     conftest
 "${prefix}${target}/bin/conftest" completion bash >"${prefix}${target}/share/bash-completion/completions/conftest"

tools/conmon/Dockerfile.template

@@ -13,6 +13,6 @@ COPY registry.json ${prefix}/etc/containers/registries.json
 COPY storage.conf ${prefix}/etc/containers/storage.conf
 
 RUN <<EOF
-curl -sL "https://github.com/nicholasdille/conmon-static/releases/download/v${version}/conmon-${alt_arch}.tar.gz" \
+curl --silent --location "https://github.com/nicholasdille/conmon-static/releases/download/v${version}/conmon-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}" --no-same-owner
 EOF

tools/containerd/Dockerfile.template

@@ -15,17 +15,17 @@ COPY snapshotters.toml "${prefix}/etc/containerd/conf.d/snapshotters.toml"
 COPY init-containerd "${prefix}/etc/init.d/containerd"
 
 RUN <<EOF
-curl -sL "https://github.com/containerd/containerd/releases/download/v${version}/containerd-${version}-linux-${alt_arch}.tar.gz" \
+curl --silent --location "https://github.com/containerd/containerd/releases/download/v${version}/containerd-${version}-linux-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}" --no-same-owner
-curl -sLo "${prefix}/etc/systemd/system/containerd.service" \
+curl --silent --location --output "${prefix}/etc/systemd/system/containerd.service" \
     "https://github.com/containerd/containerd/raw/v${version}/containerd.service"
 chmod +x "${prefix}/etc/init.d/containerd"
 EOF
 
 RUN <<EOF
-curl -sLo "${prefix}${target}/share/man/man8/containerd-config.8.md" \
+curl --silent --location --output "${prefix}${target}/share/man/man8/containerd-config.8.md" \
     "https://github.com/containerd/containerd/raw/v${version}/docs/man/containerd-config.8.md"
-curl -sLo "${prefix}${target}/share/man/man5/containerd-config.toml.5.md" \
+curl --silent --location --output "${prefix}${target}/share/man/man5/containerd-config.toml.5.md" \
     "https://github.com/containerd/containerd/raw/v${version}/docs/man/containerd-config.toml.5.md"
 go-md2man \
     -in "${prefix}${target}/share/man/man8/containerd-config.8.md" \

tools/containers-common/Dockerfile.template

@@ -10,13 +10,13 @@ ARG version
 COPY --link --from=go-md2man / /
 
 RUN <<EOF
-curl -sLo "${prefix}${target}/share/man/man5/Containerfile.5.md" \
+curl --silent --location --output "${prefix}${target}/share/man/man5/Containerfile.5.md" \
     "https://github.com/containers/common/raw/v${version}/docs/Containerfile.5.md"
-curl -sLo "${prefix}${target}/share/man/man5/containerignore.5.md" \
+curl --silent --location --output "${prefix}${target}/share/man/man5/containerignore.5.md" \
     "https://github.com/containers/common/raw/v${version}/docs/containerignore.5.md"
-curl -sLo "${prefix}${target}/share/man/man5/containers-mounts.conf.5.md" \
+curl --silent --location --output "${prefix}${target}/share/man/man5/containers-mounts.conf.5.md" \
     "https://github.com/containers/common/raw/v${version}/docs/containers-mounts.conf.5.md"
-curl -sLo "${prefix}${target}/share/man/man5/containers.conf.5.md" \
+curl --silent --location --output "${prefix}${target}/share/man/man5/containers.conf.5.md" \
     "https://github.com/containers/common/raw/v${version}/docs/containers.conf.5.md"
 go-md2man -in "${prefix}${target}/share/man/man5/Containerfile.5.md"          -out "${prefix}${target}/share/man/man5/Containerfile.5"
 go-md2man -in "${prefix}${target}/share/man/man5/containerignore.5.md"        -out "${prefix}${target}/share/man/man5/containerignore.5"

tools/containerssh/Dockerfile.template

@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sL "https://github.com/ContainerSSH/ContainerSSH/releases/download/v${version}/containerssh_${version}_linux_${alt_arch}.tar.gz" \
+curl --silent --location "https://github.com/ContainerSSH/ContainerSSH/releases/download/v${version}/containerssh_${version}_linux_${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
     containerssh \
     containerssh-auditlog-decoder \

tools/cosign/Dockerfile.template

@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sLo "${prefix}${target}/bin/cosign" \
+curl --silent --location --output "${prefix}${target}/bin/cosign" \
     "https://github.com/sigstore/cosign/releases/download/v${version}/cosign-linux-${alt_arch}"
 chmod +x "${prefix}${target}/bin/cosign"
 "${prefix}${target}/bin/cosign" completion bash >"${prefix}${target}/share/bash-completion/completions/cosign"

tools/crane/Dockerfile.template

@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sL "https://github.com/google/go-containerregistry/releases/download/v${version}/go-containerregistry_Linux_${arch}.tar.gz" \
+curl --silent --location "https://github.com/google/go-containerregistry/releases/download/v${version}/go-containerregistry_Linux_${arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
     crane
 "${prefix}${target}/bin/crane" completion bash >"${prefix}${target}/share/bash-completion/completions/crane"

tools/cri-dockerd/Dockerfile.template

@@ -7,12 +7,12 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sL "https://github.com/Mirantis/cri-dockerd/releases/download/v${version}/cri-dockerd-${version}.${alt_arch}.tgz" \
+curl --silent --location "https://github.com/Mirantis/cri-dockerd/releases/download/v${version}/cri-dockerd-${version}.${alt_arch}.tgz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --strip-components=1 --no-same-owner \
     cri-dockerd
-curl -sLo "${prefix}/etc/systemd/system/cri-docker.service" \
+curl --silent --location --output "${prefix}/etc/systemd/system/cri-docker.service" \
     "https://github.com/Mirantis/cri-dockerd/raw/v${version}/packaging/systemd/cri-docker.service"
-curl -sLo "${prefix}/etc/systemd/system/cri-docker.socket" \
+curl --silent --location --output "${prefix}/etc/systemd/system/cri-docker.socket" \
     "https://github.com/Mirantis/cri-dockerd/raw/v${version}/packaging/systemd/cri-docker.socket"
 sed -i "s|ExecStart=/usr/bin/cri-dockerd|ExecStart=${target}/bin/cri-dockerd|" "${prefix}/etc/systemd/system/cri-docker.service"
 EOF

tools/cri-o/Dockerfile.template

@@ -12,53 +12,53 @@ COPY --from=go-md2man / /
 COPY crio.conf ${prefix}/etc/crio.conf
 
 RUN <<EOF
-curl -sL "https://storage.googleapis.com/cri-o/artifacts/cri-o.${alt_arch}.v${version}.tar.gz" \
+curl --silent --location "https://storage.googleapis.com/cri-o/artifacts/cri-o.${alt_arch}.v${version}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}" --no-same-owner \
     cri-o/bin/crio \
     cri-o/bin/crio-status
 EOF
 
 RUN <<EOF
-curl -sLo "${prefix}${target}/share/bash-completion/completions/crio" \
+curl --silent --location --output "${prefix}${target}/share/bash-completion/completions/crio" \
     "https://github.com/cri-o/cri-o/raw/v${version}/completions/bash/crio"
-curl -sLo "${prefix}${target}/share/bash-completion/completions/crio-status" \
+curl --silent --location --output "${prefix}${target}/share/bash-completion/completions/crio-status" \
     "https://github.com/cri-o/cri-o/raw/v${version}/completions/bash/crio-status"
-curl -sLo "${prefix}${target}/share/fish/vendor_completions.d/crio.fish" \
+curl --silent --location --output "${prefix}${target}/share/fish/vendor_completions.d/crio.fish" \
     "https://github.com/cri-o/cri-o/raw/v${version}/completions/fish/crio.fish"
-curl -sLo "${prefix}${target}/share/fish/vendor_completions.d/crio-status.fish" \
+curl --silent --location --output "${prefix}${target}/share/fish/vendor_completions.d/crio-status.fish" \
     "https://github.com/cri-o/cri-o/raw/v${version}/completions/fish/crio-status.fish"
-curl -sLo "${prefix}${target}/share/zsh/vendor-completions/_crio" \
+curl --silent --location --output "${prefix}${target}/share/zsh/vendor-completions/_crio" \
     "https://github.com/cri-o/cri-o/raw/v${version}/completions/zsh/_crio"
-curl -sLo "${prefix}${target}/share/zsh/vendor-completions/_crio-status" \
+curl --silent --location --output "${prefix}${target}/share/zsh/vendor-completions/_crio-status" \
     "https://github.com/cri-o/cri-o/raw/v${version}/completions/zsh/_crio-status"
 EOF
 
 RUN <<EOF
 mkdir -p \
     "${prefix}/etc/sysconfig" \
     "${prefix}/etc/cni/net.d"
-curl -sLo "${prefix}/etc/systemd/system/crio.service" \
+curl --silent --location --output "${prefix}/etc/systemd/system/crio.service" \
     "https://github.com/cri-o/cri-o/raw/v${version}/contrib/systemd/crio.service"
-curl -sLo "${prefix}/etc/systemd/system/crio-wipe.service" \
+curl --silent --location --output "${prefix}/etc/systemd/system/crio-wipe.service" \
     "https://github.com/cri-o/cri-o/raw/v${version}/contrib/systemd/crio-wipe.service"
-curl -sLo "${prefix}/etc/sysconfig/crio" \
+curl --silent --location --output "${prefix}/etc/sysconfig/crio" \
     "https://github.com/cri-o/cri-o/raw/v${version}/contrib/sysconfig/crio"
-curl -sLo "${prefix}/etc/cni/net.d/10-crio-bridge.conf" \
+curl --silent --location --output "${prefix}/etc/cni/net.d/10-crio-bridge.conf" \
     "https://github.com/cri-o/cri-o/raw/v${version}/contrib/cni/10-crio-bridge.conf"
-curl -sLo "${prefix}/etc/cni/net.d/11-crio-ipv4-bridge.conf" \
+curl --silent --location --output "${prefix}/etc/cni/net.d/11-crio-ipv4-bridge.conf" \
     "https://github.com/cri-o/cri-o/raw/v${version}/contrib/cni/11-crio-ipv4-bridge.conf"
-curl -sLo "${prefix}/etc/cni/net.d/99-loopback.conf" \
+curl --silent --location --output "${prefix}/etc/cni/net.d/99-loopback.conf" \
     "https://github.com/cri-o/cri-o/raw/v${version}/contrib/cni/99-loopback.conf"
 EOF
 
 RUN <<EOF
-curl -sLo "${prefix}${target}/share/man/man8/crio.8.md" \
+curl --silent --location --output "${prefix}${target}/share/man/man8/crio.8.md" \
     "https://github.com/cri-o/cri-o/raw/v${version}/docs/crio.8.md"
-curl -sLo "${prefix}${target}/share/man/man8/crio-status.8.md" \
+curl --silent --location --output "${prefix}${target}/share/man/man8/crio-status.8.md" \
     "https://github.com/cri-o/cri-o/raw/v${version}/docs/crio-status.8.md"
-curl -sLo "${prefix}${target}/share/man/man5/crio.conf.5.md" \
+curl --silent --location --output "${prefix}${target}/share/man/man5/crio.conf.5.md" \
     "https://github.com/cri-o/cri-o/raw/v${version}/docs/crio.conf.5.md"
-curl -sLo "${prefix}${target}/share/man/man5/crio.conf.d.5.md" \
+curl --silent --location --output "${prefix}${target}/share/man/man5/crio.conf.d.5.md" \
     "https://github.com/cri-o/cri-o/raw/v${version}/docs/crio.conf.d.5.md"
 go-md2man -in "${prefix}${target}/share/man/man8/crio.8.md"        -out "${prefix}${target}/share/man/man8/crio.8"
 go-md2man -in "${prefix}${target}/share/man/man8/crio-status.8.md" -out "${prefix}${target}/share/man/man8/crio-status.8"

tools/crictl/Dockerfile.template

@@ -7,7 +7,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-curl -sL "https://github.com/kubernetes-sigs/cri-tools/releases/download/v${version}/crictl-v${version}-linux-${alt_arch}.tar.gz" \
+curl --silent --location "https://github.com/kubernetes-sigs/cri-tools/releases/download/v${version}/crictl-v${version}-linux-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory "${prefix}${target}" --no-same-owner
 EOF
 COPY crictl.yaml "${prefix}/etc/"