From 12bbf5dc4811e01030d3ef791bf13927bce2c7e7 Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Fri, 22 Dec 2023 12:41:55 +0100
Subject: [PATCH] Remove target variable #2213

---
 tools/earthly/Dockerfile.template  | 14 +++++++-------
 tools/ekz/Dockerfile.template      |  2 +-
 tools/emoj/Dockerfile.template     |  4 ++--
 tools/emojisum/Dockerfile.template |  2 +-
 tools/envcli/Dockerfile.template   |  4 ++--
 tools/envsub/Dockerfile.template   |  2 +-
 tools/etcd/Dockerfile.template     |  2 +-
 tools/etcdadm/Dockerfile.template  | 10 +++++-----
 tools/exa/Dockerfile.template      | 12 ++++++------
 9 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/tools/earthly/Dockerfile.template b/tools/earthly/Dockerfile.template
index 19019af15..dbaf6c027 100644
--- a/tools/earthly/Dockerfile.template
+++ b/tools/earthly/Dockerfile.template
@@ -14,12 +14,12 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "earthly/earthly" "v${version}" "earthly-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/earthly" \
+curl --silent --location --fail --output "${prefix}/bin/earthly" \
     "https://github.com/earthly/earthly/releases/download/v${version}/earthly-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/earthly"
-"${prefix}${target}/bin/earthly" bootstrap --with-autocomplete --no-buildkit
-cp /usr/share/bash-completion/completions/earthly "${prefix}${target}/share/bash-completion/completions/earthly"
-sed -i "s|${prefix}||" "${prefix}${target}/share/bash-completion/completions/earthly"
-cp /usr/local/share/zsh/site-functions/_earthly "${prefix}${target}/share/zsh/vendor-completions/_earthly"
-sed -i "s|${prefix}||" "${prefix}${target}/share/zsh/vendor-completions/_earthly"
+chmod +x "${prefix}/bin/earthly"
+"${prefix}/bin/earthly" bootstrap --with-autocomplete --no-buildkit
+cp /usr/share/bash-completion/completions/earthly "${prefix}/share/bash-completion/completions/earthly"
+sed -i "s|${prefix}||" "${prefix}/share/bash-completion/completions/earthly"
+cp /usr/local/share/zsh/site-functions/_earthly "${prefix}/share/zsh/vendor-completions/_earthly"
+sed -i "s|${prefix}||" "${prefix}/share/zsh/vendor-completions/_earthly"
 EOF
\ No newline at end of file
diff --git a/tools/ekz/Dockerfile.template b/tools/ekz/Dockerfile.template
index 67f09a518..be1500b9a 100644
--- a/tools/ekz/Dockerfile.template
+++ b/tools/ekz/Dockerfile.template
@@ -10,6 +10,6 @@ ARG version
 RUN <<EOF
 check-github-release-asset "chanwit/ekz" "v${version}" "ekz_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/chanwit/ekz/releases/download/v${version}/ekz_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --no-same-owner \
     ekz
 EOF
\ No newline at end of file
diff --git a/tools/emoj/Dockerfile.template b/tools/emoj/Dockerfile.template
index 5838a7b54..70973a5ba 100644
--- a/tools/emoj/Dockerfile.template
+++ b/tools/emoj/Dockerfile.template
@@ -12,12 +12,12 @@ ARG name
 ARG version
 COPY --link --from=nodejs / /
 COPY --link --from=npm / /
-WORKDIR ${prefix}${target}/libexec/emoj
+WORKDIR ${prefix}/libexec/emoj
 ARG name
 ARG version
 RUN <<EOF
 npm install \
     --omit=dev \
     "emoj@${version}"
-ln --symbolic --relative --force "${prefix}${target}/libexec/emoj/node_modules/.bin/emoj" "${prefix}${target}/bin/"
+ln --symbolic --relative --force "${prefix}/libexec/emoj/node_modules/.bin/emoj" "${prefix}/bin/"
 EOF
\ No newline at end of file
diff --git a/tools/emojisum/Dockerfile.template b/tools/emojisum/Dockerfile.template
index 6707a1ac4..242182b81 100644
--- a/tools/emojisum/Dockerfile.template
+++ b/tools/emojisum/Dockerfile.template
@@ -19,5 +19,5 @@ export CGO_ENABLED=0
 export GO111MODULE=auto
 go mod tidy
 go build -ldflags "-w -s" -o "/usr/local/bin/emojisum" .
-cp /usr/local/bin/emojisum "${prefix}${target}/bin/"
+cp /usr/local/bin/emojisum "${prefix}/bin/"
 EOF
diff --git a/tools/envcli/Dockerfile.template b/tools/envcli/Dockerfile.template
index 900ebb5b1..a5692ccdc 100644
--- a/tools/envcli/Dockerfile.template
+++ b/tools/envcli/Dockerfile.template
@@ -9,7 +9,7 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "EnvCLI/EnvCLI" "v${version}" "linux_${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/envcli" \
+curl --silent --location --fail --output "${prefix}/bin/envcli" \
     "https://github.com/EnvCLI/EnvCLI/releases/download/v${version}/linux_${alt_arch}"
-chmod +x "${prefix}${target}/bin/envcli"
+chmod +x "${prefix}/bin/envcli"
 EOF
\ No newline at end of file
diff --git a/tools/envsub/Dockerfile.template b/tools/envsub/Dockerfile.template
index 9185f4a46..e9b1ae2a4 100644
--- a/tools/envsub/Dockerfile.template
+++ b/tools/envsub/Dockerfile.template
@@ -22,5 +22,5 @@ git clone -q --config advice.detachedHead=false --depth 1 --branch "${version}"
 export CARGO_HOME=/usr/local/cargo
 export RUSTUP_HOME=/usr/local/rustup
 cargo build --release --target x86_64-unknown-linux-gnu
-cp target/x86_64-unknown-linux-gnu/release/envsub "${prefix}${target}/bin/"
+cp target/x86_64-unknown-linux-gnu/release/envsub "${prefix}/bin/"
 EOF
\ No newline at end of file
diff --git a/tools/etcd/Dockerfile.template b/tools/etcd/Dockerfile.template
index 398ffac7f..29b06bba0 100644
--- a/tools/etcd/Dockerfile.template
+++ b/tools/etcd/Dockerfile.template
@@ -10,7 +10,7 @@ ARG version
 RUN <<EOF
 check-github-release-asset "etcd-io/etcd" "v${version}" "etcd-v${version}-linux-${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/etcd-io/etcd/releases/download/v${version}/etcd-v${version}-linux-${alt_arch}.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 \
     etcd-v${version}-linux-${alt_arch}/etcd \
     etcd-v${version}-linux-${alt_arch}/etcdctl
 EOF
\ No newline at end of file
diff --git a/tools/etcdadm/Dockerfile.template b/tools/etcdadm/Dockerfile.template
index 6e33b0b58..825ec35f2 100644
--- a/tools/etcdadm/Dockerfile.template
+++ b/tools/etcdadm/Dockerfile.template
@@ -9,14 +9,14 @@ ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "kubernetes-sigs/etcdadm" "v${version}" "etcdadm-linux-${alt_arch}"
-curl --silent --location --fail --output "${prefix}${target}/bin/etcdadm" \
+curl --silent --location --fail --output "${prefix}/bin/etcdadm" \
     "https://github.com/kubernetes-sigs/etcdadm/releases/download/v${version}/etcdadm-linux-${alt_arch}"
-chmod +x "${prefix}${target}/bin/etcdadm"
+chmod +x "${prefix}/bin/etcdadm"
 EOF
 
 # completion
 #RUN <<EOF
-#"${prefix}${target}/bin/foo" completion bash >"${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/exa/Dockerfile.template b/tools/exa/Dockerfile.template
index bd5e0b866..fd32d4c08 100644
--- a/tools/exa/Dockerfile.template
+++ b/tools/exa/Dockerfile.template
@@ -14,10 +14,10 @@ filename="$(basename "${url}")"
 curl --silent --location --fail --remote-name "${url}"
 unzip -q -o -d "/tmp" "${filename}"
 
-mv /tmp/bin/exa "${prefix}${target}/bin/"
-mv /tmp/man/exa.1 "${prefix}${target}/share/man/man1/"
-mv /tmp/man/exa_colors.5 "${prefix}${target}/share/man/man5/"
-mv /tmp/completions/exa.bash "${prefix}${target}/share/bash-completion/completions/exa"
-mv /tmp/completions/exa.fish "${prefix}${target}/share/fish/vendor_completions.d/exa.fish"
-mv /tmp/completions/exa.zsh  "${prefix}${target}/share/zsh/vendor-completions/_exa"
+mv /tmp/bin/exa "${prefix}/bin/"
+mv /tmp/man/exa.1 "${prefix}/share/man/man1/"
+mv /tmp/man/exa_colors.5 "${prefix}/share/man/man5/"
+mv /tmp/completions/exa.bash "${prefix}/share/bash-completion/completions/exa"
+mv /tmp/completions/exa.fish "${prefix}/share/fish/vendor_completions.d/exa.fish"
+mv /tmp/completions/exa.zsh  "${prefix}/share/zsh/vendor-completions/_exa"
 EOF
\ No newline at end of file