From 81c2905a45ef0f82c4b63ebf409bea7fd8c34e8a Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Thu, 2 Oct 2025 17:55:50 -0600
Subject: [PATCH 01/12] chore: Remove unused f-strings

---
 x.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/x.py b/x.py
index f4a71b1..7d42418 100755
--- a/x.py
+++ b/x.py
@@ -224,14 +224,14 @@ def update_nightly_ci():
         versions += f"          - name: {variant.name}\n"
         versions += f"            context: nightly/{variant.name}\n"
         versions += f"            platforms: {platforms}\n"
-        versions += f"            tags: |\n"
+        versions += "            tags: |\n"
         for tag in tags:
             versions += f"              {tag}\n"
 
         versions += f"          - name: slim-{variant.name}\n"
         versions += f"            context: nightly/{variant.name}/slim\n"
         versions += f"            platforms: {platforms}\n"
-        versions += f"            tags: |\n"
+        versions += "            tags: |\n"
         for tag in tags:
             versions += f"              {tag}-slim\n"
 
@@ -248,7 +248,7 @@ def update_nightly_ci():
         versions += f"          - name: alpine{version}\n"
         versions += f"            context: nightly/alpine{version}\n"
         versions += f"            platforms: {platforms}\n"
-        versions += f"            tags: |\n"
+        versions += "            tags: |\n"
         for tag in tags:
             versions += f"              {tag}\n"
 

From fd766fa1c801b7a465256887874d3f2be5992d1d Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Mon, 26 May 2025 18:22:53 -0600
Subject: [PATCH 02/12] chore: Rename Debian variant to release

---
 x.py | 96 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/x.py b/x.py
index 7d42418..41901be 100755
--- a/x.py
+++ b/x.py
@@ -34,16 +34,16 @@
     DebianArch("riscv64", "riscv64", "linux/riscv64", "riscv64gc-unknown-linux-gnu"),
 ]
 
-DebianVariant = namedtuple("DebianVariant", ["name", "arches"])
-
-debian_variants = [
-    DebianVariant("bullseye", debian_lts_arches),
-    DebianVariant("bookworm", debian_lts_arches + debian_non_lts_arches),
-    DebianVariant("trixie", debian_lts_arches + debian_non_lts_arches + debian_trixie_arches),
+latest_debian_release = "trixie"
+
+DebianRelease = namedtuple("DebianRelease", ["name", "arches"])
+ 
+debian_releases = [
+    DebianRelease("bullseye", debian_lts_arches),
+    DebianRelease("bookworm", debian_lts_arches + debian_non_lts_arches),
+    DebianRelease(latest_debian_release, debian_lts_arches + debian_non_lts_arches + debian_trixie_arches),
 ]
 
-default_debian_variant = "trixie"
-
 AlpineArch = namedtuple("AlpineArch", ["bashbrew", "apk", "qemu", "rust"])
 
 alpine_arches = [
@@ -83,28 +83,28 @@ def update_debian():
     template = read_file("Dockerfile-debian.template")
     slim_template = read_file("Dockerfile-slim.template")
 
-    for variant in debian_variants:
+    for release in debian_releases:
         arch_case = 'dpkgArch="$(dpkg --print-architecture)"; \\\n'
         arch_case += '    case "${dpkgArch##*-}" in \\\n'
-        for arch in variant.arches:
-            hash = rustup_hash(arch.rust)
-            arch_case += f"        {arch.dpkg}) rustArch='{arch.rust}'; rustupSha256='{hash}' ;; \\\n"
+        for debian_arch in release.arches:
+            hash = rustup_hash(debian_arch.rust)
+            arch_case += f"        {debian_arch.dpkg}) rustArch='{debian_arch.rust}'; rustupSha256='{hash}' ;; \\\n"
         arch_case += end
 
         for channel in supported_channels:
             rendered = template \
                 .replace("%%RUST-VERSION%%", channel.rust_version) \
                 .replace("%%RUSTUP-VERSION%%", rustup_version) \
-                .replace("%%DEBIAN-SUITE%%", variant.name) \
+                .replace("%%DEBIAN-SUITE%%", release.name) \
                 .replace("%%ARCH-CASE%%", arch_case)
-            write_file(f"{channel.name}/{variant.name}/Dockerfile", rendered)
+            write_file(f"{channel.name}/{release.name}/Dockerfile", rendered)
 
             rendered = slim_template \
                 .replace("%%RUST-VERSION%%", channel.rust_version) \
                 .replace("%%RUSTUP-VERSION%%", rustup_version) \
-                .replace("%%DEBIAN-SUITE%%", variant.name) \
+                .replace("%%DEBIAN-SUITE%%", release.name) \
                 .replace("%%ARCH-CASE%%", arch_case)
-            write_file(f"{channel.name}/{variant.name}/slim/Dockerfile", rendered)
+            write_file(f"{channel.name}/{release.name}/slim/Dockerfile", rendered)
 
 def update_alpine():
     arch_case = 'apkArch="$(apk --print-arch)"; \\\n'
@@ -135,11 +135,11 @@ def update_ci():
     rendered = split[0] + marker + f"      RUST_VERSION: {stable.rust_version}\n" + marker + split[2]
 
     versions = ""
-    for variant in debian_variants:
-        versions += f"          - name: {variant.name}\n"
-        versions += f"            variant: {variant.name}\n"
-        versions += f"          - name: slim-{variant.name}\n"
-        versions += f"            variant: {variant.name}/slim\n"
+    for release in debian_releases:
+        versions += f"          - name: {release.name}\n"
+        versions += f"            variant: {release.name}\n"
+        versions += f"          - name: slim-{release.name}\n"
+        versions += f"            variant: {release.name}/slim\n"
 
     for version in alpine_versions:
         versions += f"          - name: alpine{version}\n"
@@ -170,31 +170,31 @@ def update_mirror_stable_ci():
         for tag in tags:
             versions += f"              {tag}\n"
 
-    for variant in debian_variants:
+    for release in debian_releases:
         tags = []
         for version_tag in version_tags():
-            tags.append(f"{version_tag}-{variant.name}")
-        tags.append(variant.name)
-        if variant.name == default_debian_variant:
+            tags.append(f"{version_tag}-{release.name}")
+        tags.append(release.name)
+        if release.name == latest_debian_release:
             for version_tag in version_tags():
                 tags.append(version_tag)
             tags.append("latest")
 
-        versions += f"          - name: {variant.name}\n"
+        versions += f"          - name: {release.name}\n"
         versions += "            tags: |\n"
         for tag in tags:
             versions += f"              {tag}\n"
 
         tags = []
         for version_tag in version_tags():
-            tags.append(f"{version_tag}-slim-{variant.name}")
-        tags.append(f"slim-{variant.name}")
-        if variant.name == default_debian_variant:
+            tags.append(f"{version_tag}-slim-{release.name}")
+        tags.append(f"slim-{release.name}")
+        if release.name == latest_debian_release:
             for version_tag in version_tags():
                 tags.append(f"{version_tag}-slim")
             tags.append("slim")
         
-        versions += f"          - name: slim-{variant.name}\n"
+        versions += f"          - name: slim-{release.name}\n"
         versions += "            tags: |\n"
         for tag in tags:
             versions += f"              {tag}\n" 
@@ -211,25 +211,25 @@ def update_nightly_ci():
 
 
     versions = ""
-    for variant in debian_variants:
+    for release in debian_releases:
         platforms = []
-        for arch in variant.arches:
+        for arch in release.arches:
             platforms.append(f"{arch.qemu}")
         platforms = ",".join(platforms)
 
-        tags = [f"nightly-{variant.name}"]
-        if variant.name == default_debian_variant:
+        tags = [f"nightly-{release.name}"]
+        if release.name == latest_debian_release:
             tags.append("nightly")
 
-        versions += f"          - name: {variant.name}\n"
-        versions += f"            context: nightly/{variant.name}\n"
+        versions += f"          - name: {release.name}\n"
+        versions += f"            context: nightly/{release.name}\n"
         versions += f"            platforms: {platforms}\n"
         versions += "            tags: |\n"
         for tag in tags:
             versions += f"              {tag}\n"
 
-        versions += f"          - name: slim-{variant.name}\n"
-        versions += f"            context: nightly/{variant.name}/slim\n"
+        versions += f"          - name: slim-{release.name}\n"
+        versions += f"            context: nightly/{release.name}/slim\n"
         versions += f"            platforms: {platforms}\n"
         versions += "            tags: |\n"
         for tag in tags:
@@ -292,28 +292,28 @@ def generate_stackbrew_library():
 GitRepo: https://github.com/rust-lang/docker-rust.git
 """
 
-    for variant in debian_variants:
+    for release in debian_releases:
         tags = []
         for version_tag in version_tags():
-            tags.append(f"{version_tag}-{variant.name}")
-        tags.append(variant.name)
-        if variant.name == default_debian_variant:
+            tags.append(f"{version_tag}-{release.name}")
+        tags.append(release.name)
+        if release.name == latest_debian_release:
             for version_tag in version_tags():
                 tags.append(version_tag)
             tags.append("latest")
 
-        arches = variant.arches[:]
+        arches = release.arches[:]
 
         library += single_library(
                 tags,
                 map(lambda a: a.bashbrew, arches),
-                os.path.join(stable.name, variant.name))
+                os.path.join(stable.name, release.name))
 
         tags = []
         for version_tag in version_tags():
-            tags.append(f"{version_tag}-slim-{variant.name}")
-        tags.append(f"slim-{variant.name}")
-        if variant.name == default_debian_variant:
+            tags.append(f"{version_tag}-slim-{release.name}")
+        tags.append(f"slim-{release.name}")
+        if release.name == latest_debian_release:
             for version_tag in version_tags():
                 tags.append(f"{version_tag}-slim")
             tags.append("slim")
@@ -321,7 +321,7 @@ def generate_stackbrew_library():
         library += single_library(
                 tags,
                 map(lambda a: a.bashbrew, arches),
-                os.path.join(stable.name, variant.name, "slim"))
+                os.path.join(stable.name, release.name, "slim"))
 
     for version in alpine_versions:
         tags = []

From c8d6f3e0e6db8ad30ef255206b7ad241b4700baa Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Mon, 26 May 2025 18:41:38 -0600
Subject: [PATCH 03/12] chore: Rename default_alpine_version

---
 x.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/x.py b/x.py
index 41901be..5d2a6d8 100755
--- a/x.py
+++ b/x.py
@@ -52,14 +52,13 @@
     AlpineArch("ppc64le", "ppc64le", "linux/ppc64le", "powerpc64le-unknown-linux-musl"),
 ]
 
+latest_alpine_version = "3.22"
 alpine_versions = [
     "3.20",
     "3.21",
-    "3.22",
+    latest_alpine_version,
 ]
 
-default_alpine_version = "3.22"
-
 def rustup_hash(arch):
     url = f"https://static.rust-lang.org/rustup/archive/{rustup_version}/{arch}/rustup-init.sha256"
     with request.urlopen(url) as f:
@@ -160,7 +159,7 @@ def update_mirror_stable_ci():
         for version_tag in version_tags():
             tags.append(f"{version_tag}-alpine{version}")
         tags.append(f"alpine{version}")
-        if version == default_alpine_version:
+        if version == latest_alpine_version:
             for version_tag in version_tags():
                 tags.append(f"{version_tag}-alpine")
             tags.append("alpine")
@@ -242,7 +241,7 @@ def update_nightly_ci():
         platforms = ",".join(platforms)
 
         tags = [f"nightly-alpine{version}"]
-        if version == default_alpine_version:
+        if version == latest_alpine_version:
             tags.append("nightly-alpine")
 
         versions += f"          - name: alpine{version}\n"
@@ -328,7 +327,7 @@ def generate_stackbrew_library():
         for version_tag in version_tags():
             tags.append(f"{version_tag}-alpine{version}")
         tags.append(f"alpine{version}")
-        if version == default_alpine_version:
+        if version == latest_alpine_version:
             for version_tag in version_tags():
                 tags.append(f"{version_tag}-alpine")
             tags.append("alpine")

From 41cc135363b1705d350c00e9b71f464349d38b55 Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Mon, 26 May 2025 18:44:49 -0600
Subject: [PATCH 04/12] refactor: Move adding an arch case to a function

---
 x.py | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/x.py b/x.py
index 5d2a6d8..f7c8c20 100755
--- a/x.py
+++ b/x.py
@@ -83,36 +83,34 @@ def update_debian():
     slim_template = read_file("Dockerfile-slim.template")
 
     for release in debian_releases:
-        arch_case = 'dpkgArch="$(dpkg --print-architecture)"; \\\n'
-        arch_case += '    case "${dpkgArch##*-}" in \\\n'
+        arch_cases_str = 'dpkgArch="$(dpkg --print-architecture)"; \\\n'
+        arch_cases_str += '    case "${dpkgArch##*-}" in \\\n'
         for debian_arch in release.arches:
-            hash = rustup_hash(debian_arch.rust)
-            arch_case += f"        {debian_arch.dpkg}) rustArch='{debian_arch.rust}'; rustupSha256='{hash}' ;; \\\n"
-        arch_case += end
+            arch_cases_str += arch_case(debian_arch.dpkg, debian_arch.rust)
+        arch_cases_str += end
 
         for channel in supported_channels:
             rendered = template \
                 .replace("%%RUST-VERSION%%", channel.rust_version) \
                 .replace("%%RUSTUP-VERSION%%", rustup_version) \
                 .replace("%%DEBIAN-SUITE%%", release.name) \
-                .replace("%%ARCH-CASE%%", arch_case)
+                .replace("%%ARCH-CASE%%", arch_cases_str)
             write_file(f"{channel.name}/{release.name}/Dockerfile", rendered)
 
             rendered = slim_template \
                 .replace("%%RUST-VERSION%%", channel.rust_version) \
                 .replace("%%RUSTUP-VERSION%%", rustup_version) \
                 .replace("%%DEBIAN-SUITE%%", release.name) \
-                .replace("%%ARCH-CASE%%", arch_case)
+                .replace("%%ARCH-CASE%%", arch_cases_str)
             write_file(f"{channel.name}/{release.name}/slim/Dockerfile", rendered)
 
 def update_alpine():
-    arch_case = 'apkArch="$(apk --print-arch)"; \\\n'
-    arch_case += '    case "$apkArch" in \\\n'
+    arch_cases_str = 'apkArch="$(apk --print-arch)"; \\\n'
+    arch_cases_str += '    case "$apkArch" in \\\n'
     for arch in alpine_arches:
-        hash = rustup_hash(arch.rust)
-        arch_case += f"        {arch.apk}) rustArch='{arch.rust}'; rustupSha256='{hash}' ;; \\\n"
-    arch_case += '        *) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \\\n'
-    arch_case += '    esac'
+        arch_cases_str += arch_case(arch.apk, arch.rust)
+    arch_cases_str += '        *) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \\\n'
+    arch_cases_str += '    esac'
 
     template = read_file("Dockerfile-alpine.template")
 
@@ -122,9 +120,13 @@ def update_alpine():
                 .replace("%%RUST-VERSION%%", channel.rust_version) \
                 .replace("%%RUSTUP-VERSION%%", rustup_version) \
                 .replace("%%TAG%%", version) \
-                .replace("%%ARCH-CASE%%", arch_case)
+                .replace("%%ARCH-CASE%%", arch_cases_str)
             write_file(f"{channel.name}/alpine{version}/Dockerfile", rendered)
 
+def arch_case(distro_arch, rust_arch):
+    rustup_sha256 = rustup_hash(rust_arch)
+    return f"        {distro_arch}) rustArch='{rust_arch}'; rustupSha256='{rustup_sha256}' ;; \\\n"
+
 def update_ci():
     file = ".github/workflows/ci.yml"
     config = read_file(file)

From f21cff0d5975b6212fa36f7528b201470031250f Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Mon, 26 May 2025 20:24:18 -0600
Subject: [PATCH 05/12] refactor: Unify arch case creation

---
 nightly/alpine3.20/Dockerfile    |  6 +++---
 nightly/alpine3.21/Dockerfile    |  6 +++---
 nightly/alpine3.22/Dockerfile    |  6 +++---
 nightly/bookworm/Dockerfile      |  6 +++---
 nightly/bookworm/slim/Dockerfile |  6 +++---
 nightly/bullseye/Dockerfile      |  6 +++---
 nightly/bullseye/slim/Dockerfile |  6 +++---
 nightly/trixie/Dockerfile        |  6 +++---
 nightly/trixie/slim/Dockerfile   |  6 +++---
 stable/alpine3.20/Dockerfile     |  6 +++---
 stable/alpine3.21/Dockerfile     |  6 +++---
 stable/alpine3.22/Dockerfile     |  6 +++---
 stable/bookworm/Dockerfile       |  6 +++---
 stable/bookworm/slim/Dockerfile  |  6 +++---
 stable/bullseye/Dockerfile       |  6 +++---
 stable/bullseye/slim/Dockerfile  |  6 +++---
 stable/trixie/Dockerfile         |  6 +++---
 stable/trixie/slim/Dockerfile    |  6 +++---
 x.py                             | 24 ++++++++++++++----------
 19 files changed, 68 insertions(+), 64 deletions(-)

diff --git a/nightly/alpine3.20/Dockerfile b/nightly/alpine3.20/Dockerfile
index 61100e2..febf04b 100644
--- a/nightly/alpine3.20/Dockerfile
+++ b/nightly/alpine3.20/Dockerfile
@@ -12,12 +12,12 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=nightly
 
 RUN set -eux; \
-    apkArch="$(apk --print-arch)"; \
-    case "$apkArch" in \
+    arch="$(apk --print-arch)"; \
+    case "$arch" in \
         x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
         aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
         ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
-        *) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \
+        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/nightly/alpine3.21/Dockerfile b/nightly/alpine3.21/Dockerfile
index da7689c..1090b32 100644
--- a/nightly/alpine3.21/Dockerfile
+++ b/nightly/alpine3.21/Dockerfile
@@ -12,12 +12,12 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=nightly
 
 RUN set -eux; \
-    apkArch="$(apk --print-arch)"; \
-    case "$apkArch" in \
+    arch="$(apk --print-arch)"; \
+    case "$arch" in \
         x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
         aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
         ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
-        *) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \
+        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/nightly/alpine3.22/Dockerfile b/nightly/alpine3.22/Dockerfile
index da43546..1d8895f 100644
--- a/nightly/alpine3.22/Dockerfile
+++ b/nightly/alpine3.22/Dockerfile
@@ -12,12 +12,12 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=nightly
 
 RUN set -eux; \
-    apkArch="$(apk --print-arch)"; \
-    case "$apkArch" in \
+    arch="$(apk --print-arch)"; \
+    case "$arch" in \
         x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
         aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
         ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
-        *) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \
+        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/nightly/bookworm/Dockerfile b/nightly/bookworm/Dockerfile
index c404ec5..475ca2b 100644
--- a/nightly/bookworm/Dockerfile
+++ b/nightly/bookworm/Dockerfile
@@ -8,15 +8,15 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=nightly
 
 RUN set -eux; \
-    dpkgArch="$(dpkg --print-architecture)"; \
-    case "${dpkgArch##*-}" in \
+    arch="$(dpkg --print-architecture)"; \
+    case "$arch" in \
         amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
         armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
         arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
         i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
         ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
         s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
-        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/nightly/bookworm/slim/Dockerfile b/nightly/bookworm/slim/Dockerfile
index 753f25e..fe032d2 100644
--- a/nightly/bookworm/slim/Dockerfile
+++ b/nightly/bookworm/slim/Dockerfile
@@ -15,15 +15,15 @@ RUN set -eux; \
         libc6-dev \
         wget \
         ; \
-    dpkgArch="$(dpkg --print-architecture)"; \
-    case "${dpkgArch##*-}" in \
+    arch="$(dpkg --print-architecture)"; \
+    case "$arch" in \
         amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
         armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
         arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
         i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
         ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
         s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
-        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/nightly/bullseye/Dockerfile b/nightly/bullseye/Dockerfile
index 409a3da..f88b793 100644
--- a/nightly/bullseye/Dockerfile
+++ b/nightly/bullseye/Dockerfile
@@ -8,13 +8,13 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=nightly
 
 RUN set -eux; \
-    dpkgArch="$(dpkg --print-architecture)"; \
-    case "${dpkgArch##*-}" in \
+    arch="$(dpkg --print-architecture)"; \
+    case "$arch" in \
         amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
         armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
         arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
         i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
-        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/nightly/bullseye/slim/Dockerfile b/nightly/bullseye/slim/Dockerfile
index e21b2e7..774eed0 100644
--- a/nightly/bullseye/slim/Dockerfile
+++ b/nightly/bullseye/slim/Dockerfile
@@ -15,13 +15,13 @@ RUN set -eux; \
         libc6-dev \
         wget \
         ; \
-    dpkgArch="$(dpkg --print-architecture)"; \
-    case "${dpkgArch##*-}" in \
+    arch="$(dpkg --print-architecture)"; \
+    case "$arch" in \
         amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
         armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
         arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
         i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
-        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/nightly/trixie/Dockerfile b/nightly/trixie/Dockerfile
index a39abc1..24fd02c 100644
--- a/nightly/trixie/Dockerfile
+++ b/nightly/trixie/Dockerfile
@@ -8,8 +8,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=nightly
 
 RUN set -eux; \
-    dpkgArch="$(dpkg --print-architecture)"; \
-    case "${dpkgArch##*-}" in \
+    arch="$(dpkg --print-architecture)"; \
+    case "$arch" in \
         amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
         armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
         arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
@@ -17,7 +17,7 @@ RUN set -eux; \
         ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
         s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
         riscv64) rustArch='riscv64gc-unknown-linux-gnu'; rustupSha256='09e64cc1b7a3e99adaa15dd2d46a3aad9d44d71041e2a96100d165c98a8fd7a7' ;; \
-        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/nightly/trixie/slim/Dockerfile b/nightly/trixie/slim/Dockerfile
index 7f8984a..2eeb9f9 100644
--- a/nightly/trixie/slim/Dockerfile
+++ b/nightly/trixie/slim/Dockerfile
@@ -15,8 +15,8 @@ RUN set -eux; \
         libc6-dev \
         wget \
         ; \
-    dpkgArch="$(dpkg --print-architecture)"; \
-    case "${dpkgArch##*-}" in \
+    arch="$(dpkg --print-architecture)"; \
+    case "$arch" in \
         amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
         armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
         arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
@@ -24,7 +24,7 @@ RUN set -eux; \
         ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
         s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
         riscv64) rustArch='riscv64gc-unknown-linux-gnu'; rustupSha256='09e64cc1b7a3e99adaa15dd2d46a3aad9d44d71041e2a96100d165c98a8fd7a7' ;; \
-        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/stable/alpine3.20/Dockerfile b/stable/alpine3.20/Dockerfile
index 3665ef1..d0ed698 100644
--- a/stable/alpine3.20/Dockerfile
+++ b/stable/alpine3.20/Dockerfile
@@ -12,12 +12,12 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=1.90.0
 
 RUN set -eux; \
-    apkArch="$(apk --print-arch)"; \
-    case "$apkArch" in \
+    arch="$(apk --print-arch)"; \
+    case "$arch" in \
         x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
         aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
         ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
-        *) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \
+        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/stable/alpine3.21/Dockerfile b/stable/alpine3.21/Dockerfile
index b47b8b0..6c50340 100644
--- a/stable/alpine3.21/Dockerfile
+++ b/stable/alpine3.21/Dockerfile
@@ -12,12 +12,12 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=1.90.0
 
 RUN set -eux; \
-    apkArch="$(apk --print-arch)"; \
-    case "$apkArch" in \
+    arch="$(apk --print-arch)"; \
+    case "$arch" in \
         x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
         aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
         ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
-        *) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \
+        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/stable/alpine3.22/Dockerfile b/stable/alpine3.22/Dockerfile
index ec8b2bf..d59d030 100644
--- a/stable/alpine3.22/Dockerfile
+++ b/stable/alpine3.22/Dockerfile
@@ -12,12 +12,12 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=1.90.0
 
 RUN set -eux; \
-    apkArch="$(apk --print-arch)"; \
-    case "$apkArch" in \
+    arch="$(apk --print-arch)"; \
+    case "$arch" in \
         x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
         aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
         ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
-        *) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \
+        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/stable/bookworm/Dockerfile b/stable/bookworm/Dockerfile
index 8ae02ee..1fbf89d 100644
--- a/stable/bookworm/Dockerfile
+++ b/stable/bookworm/Dockerfile
@@ -8,15 +8,15 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=1.90.0
 
 RUN set -eux; \
-    dpkgArch="$(dpkg --print-architecture)"; \
-    case "${dpkgArch##*-}" in \
+    arch="$(dpkg --print-architecture)"; \
+    case "$arch" in \
         amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
         armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
         arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
         i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
         ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
         s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
-        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/stable/bookworm/slim/Dockerfile b/stable/bookworm/slim/Dockerfile
index d1ac339..15ff2ee 100644
--- a/stable/bookworm/slim/Dockerfile
+++ b/stable/bookworm/slim/Dockerfile
@@ -15,15 +15,15 @@ RUN set -eux; \
         libc6-dev \
         wget \
         ; \
-    dpkgArch="$(dpkg --print-architecture)"; \
-    case "${dpkgArch##*-}" in \
+    arch="$(dpkg --print-architecture)"; \
+    case "$arch" in \
         amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
         armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
         arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
         i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
         ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
         s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
-        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/stable/bullseye/Dockerfile b/stable/bullseye/Dockerfile
index 45d7e61..1be0155 100644
--- a/stable/bullseye/Dockerfile
+++ b/stable/bullseye/Dockerfile
@@ -8,13 +8,13 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=1.90.0
 
 RUN set -eux; \
-    dpkgArch="$(dpkg --print-architecture)"; \
-    case "${dpkgArch##*-}" in \
+    arch="$(dpkg --print-architecture)"; \
+    case "$arch" in \
         amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
         armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
         arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
         i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
-        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/stable/bullseye/slim/Dockerfile b/stable/bullseye/slim/Dockerfile
index 9ca6739..044a4e5 100644
--- a/stable/bullseye/slim/Dockerfile
+++ b/stable/bullseye/slim/Dockerfile
@@ -15,13 +15,13 @@ RUN set -eux; \
         libc6-dev \
         wget \
         ; \
-    dpkgArch="$(dpkg --print-architecture)"; \
-    case "${dpkgArch##*-}" in \
+    arch="$(dpkg --print-architecture)"; \
+    case "$arch" in \
         amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
         armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
         arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
         i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
-        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/stable/trixie/Dockerfile b/stable/trixie/Dockerfile
index 9f8e280..8879c0d 100644
--- a/stable/trixie/Dockerfile
+++ b/stable/trixie/Dockerfile
@@ -8,8 +8,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=1.90.0
 
 RUN set -eux; \
-    dpkgArch="$(dpkg --print-architecture)"; \
-    case "${dpkgArch##*-}" in \
+    arch="$(dpkg --print-architecture)"; \
+    case "$arch" in \
         amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
         armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
         arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
@@ -17,7 +17,7 @@ RUN set -eux; \
         ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
         s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
         riscv64) rustArch='riscv64gc-unknown-linux-gnu'; rustupSha256='09e64cc1b7a3e99adaa15dd2d46a3aad9d44d71041e2a96100d165c98a8fd7a7' ;; \
-        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/stable/trixie/slim/Dockerfile b/stable/trixie/slim/Dockerfile
index 4191bb1..80cf4d0 100644
--- a/stable/trixie/slim/Dockerfile
+++ b/stable/trixie/slim/Dockerfile
@@ -15,8 +15,8 @@ RUN set -eux; \
         libc6-dev \
         wget \
         ; \
-    dpkgArch="$(dpkg --print-architecture)"; \
-    case "${dpkgArch##*-}" in \
+    arch="$(dpkg --print-architecture)"; \
+    case "$arch" in \
         amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
         armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
         arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
@@ -24,7 +24,7 @@ RUN set -eux; \
         ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
         s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
         riscv64) rustArch='riscv64gc-unknown-linux-gnu'; rustupSha256='09e64cc1b7a3e99adaa15dd2d46a3aad9d44d71041e2a96100d165c98a8fd7a7' ;; \
-        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/x.py b/x.py
index f7c8c20..adee3a5 100755
--- a/x.py
+++ b/x.py
@@ -76,18 +76,14 @@ def write_file(file, contents):
         f.write(contents)
 
 def update_debian():
-    end = '        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \\\n'
-    end += '    esac'
-
     template = read_file("Dockerfile-debian.template")
     slim_template = read_file("Dockerfile-slim.template")
 
     for release in debian_releases:
-        arch_cases_str = 'dpkgArch="$(dpkg --print-architecture)"; \\\n'
-        arch_cases_str += '    case "${dpkgArch##*-}" in \\\n'
+        arch_cases_str = arch_cases_start("$(dpkg --print-architecture)")
         for debian_arch in release.arches:
             arch_cases_str += arch_case(debian_arch.dpkg, debian_arch.rust)
-        arch_cases_str += end
+        arch_cases_str += arch_cases_end()
 
         for channel in supported_channels:
             rendered = template \
@@ -105,12 +101,10 @@ def update_debian():
             write_file(f"{channel.name}/{release.name}/slim/Dockerfile", rendered)
 
 def update_alpine():
-    arch_cases_str = 'apkArch="$(apk --print-arch)"; \\\n'
-    arch_cases_str += '    case "$apkArch" in \\\n'
+    arch_cases_str = arch_cases_start("$(apk --print-arch)")
     for arch in alpine_arches:
         arch_cases_str += arch_case(arch.apk, arch.rust)
-    arch_cases_str += '        *) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \\\n'
-    arch_cases_str += '    esac'
+    arch_cases_str += arch_cases_end()
 
     template = read_file("Dockerfile-alpine.template")
 
@@ -123,6 +117,16 @@ def update_alpine():
                 .replace("%%ARCH-CASE%%", arch_cases_str)
             write_file(f"{channel.name}/alpine{version}/Dockerfile", rendered)
 
+def arch_cases_start(arch_cmd):
+    start = f'arch="{arch_cmd}"; \\\n'
+    start += '    case "$arch" in \\\n'
+    return start
+
+def arch_cases_end():
+    end = '        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \\\n'
+    end += '    esac'
+    return end
+
 def arch_case(distro_arch, rust_arch):
     rustup_sha256 = rustup_hash(rust_arch)
     return f"        {distro_arch}) rustArch='{rust_arch}'; rustupSha256='{rustup_sha256}' ;; \\\n"

From 5c1df35dbf2f3d11f8c699e60c729c3141746df5 Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Mon, 26 May 2025 22:29:58 -0600
Subject: [PATCH 06/12] refactor: Unify Docker tag replacement name

---
 Dockerfile-debian.template | 2 +-
 Dockerfile-slim.template   | 2 +-
 x.py                       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 90b0a61..a58247d 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -1,4 +1,4 @@
-FROM buildpack-deps:%%DEBIAN-SUITE%%
+FROM buildpack-deps:%%TAG%%
 
 LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust
 
diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template
index b5622b8..288d663 100644
--- a/Dockerfile-slim.template
+++ b/Dockerfile-slim.template
@@ -1,4 +1,4 @@
-FROM debian:%%DEBIAN-SUITE%%-slim
+FROM debian:%%TAG%%-slim
 
 LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust
 
diff --git a/x.py b/x.py
index adee3a5..aa2923c 100755
--- a/x.py
+++ b/x.py
@@ -89,14 +89,14 @@ def update_debian():
             rendered = template \
                 .replace("%%RUST-VERSION%%", channel.rust_version) \
                 .replace("%%RUSTUP-VERSION%%", rustup_version) \
-                .replace("%%DEBIAN-SUITE%%", release.name) \
+                .replace("%%TAG%%", release.name) \
                 .replace("%%ARCH-CASE%%", arch_cases_str)
             write_file(f"{channel.name}/{release.name}/Dockerfile", rendered)
 
             rendered = slim_template \
                 .replace("%%RUST-VERSION%%", channel.rust_version) \
                 .replace("%%RUSTUP-VERSION%%", rustup_version) \
-                .replace("%%DEBIAN-SUITE%%", release.name) \
+                .replace("%%TAG%%", release.name) \
                 .replace("%%ARCH-CASE%%", arch_cases_str)
             write_file(f"{channel.name}/{release.name}/slim/Dockerfile", rendered)
 

From ff15d52afcdaad22682ff16bfea7908301ef9882 Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Mon, 26 May 2025 20:54:29 -0600
Subject: [PATCH 07/12] refactor: Add a function for rendering templates

---
 x.py | 61 ++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/x.py b/x.py
index aa2923c..86fdad1 100755
--- a/x.py
+++ b/x.py
@@ -76,9 +76,6 @@ def write_file(file, contents):
         f.write(contents)
 
 def update_debian():
-    template = read_file("Dockerfile-debian.template")
-    slim_template = read_file("Dockerfile-slim.template")
-
     for release in debian_releases:
         arch_cases_str = arch_cases_start("$(dpkg --print-architecture)")
         for debian_arch in release.arches:
@@ -86,19 +83,21 @@ def update_debian():
         arch_cases_str += arch_cases_end()
 
         for channel in supported_channels:
-            rendered = template \
-                .replace("%%RUST-VERSION%%", channel.rust_version) \
-                .replace("%%RUSTUP-VERSION%%", rustup_version) \
-                .replace("%%TAG%%", release.name) \
-                .replace("%%ARCH-CASE%%", arch_cases_str)
-            write_file(f"{channel.name}/{release.name}/Dockerfile", rendered)
-
-            rendered = slim_template \
-                .replace("%%RUST-VERSION%%", channel.rust_version) \
-                .replace("%%RUSTUP-VERSION%%", rustup_version) \
-                .replace("%%TAG%%", release.name) \
-                .replace("%%ARCH-CASE%%", arch_cases_str)
-            write_file(f"{channel.name}/{release.name}/slim/Dockerfile", rendered)
+            render_template(
+                "Dockerfile-debian.template",
+                channel.rust_version,
+                release.name,
+                arch_cases_str,
+                f"{channel.name}/{release.name}/Dockerfile",
+            )
+
+            render_template(
+                "Dockerfile-slim.template",
+                channel.rust_version,
+                release.name,
+                arch_cases_str,
+                f"{channel.name}/{release.name}/slim/Dockerfile",
+            )
 
 def update_alpine():
     arch_cases_str = arch_cases_start("$(apk --print-arch)")
@@ -106,16 +105,15 @@ def update_alpine():
         arch_cases_str += arch_case(arch.apk, arch.rust)
     arch_cases_str += arch_cases_end()
 
-    template = read_file("Dockerfile-alpine.template")
-
     for version in alpine_versions:
         for channel in supported_channels:
-            rendered = template \
-                .replace("%%RUST-VERSION%%", channel.rust_version) \
-                .replace("%%RUSTUP-VERSION%%", rustup_version) \
-                .replace("%%TAG%%", version) \
-                .replace("%%ARCH-CASE%%", arch_cases_str)
-            write_file(f"{channel.name}/alpine{version}/Dockerfile", rendered)
+            render_template(
+                "Dockerfile-alpine.template",
+                channel.rust_version,
+                version,
+                arch_cases_str,
+                f"{channel.name}/alpine{version}/Dockerfile",
+            )
 
 def arch_cases_start(arch_cmd):
     start = f'arch="{arch_cmd}"; \\\n'
@@ -131,6 +129,21 @@ def arch_case(distro_arch, rust_arch):
     rustup_sha256 = rustup_hash(rust_arch)
     return f"        {distro_arch}) rustArch='{rust_arch}'; rustupSha256='{rustup_sha256}' ;; \\\n"
 
+def render_template(
+    template_path,
+    rust_version,
+    docker_tag,
+    arch_cases,
+    rendered_path
+):
+    template = read_file(template_path)
+    rendered = template \
+        .replace("%%TAG%%", docker_tag) \
+        .replace("%%RUST-VERSION%%", rust_version) \
+        .replace("%%RUSTUP-VERSION%%", rustup_version) \
+        .replace("%%ARCH-CASE%%", arch_cases)
+    write_file(rendered_path, rendered)
+
 def update_ci():
     file = ".github/workflows/ci.yml"
     config = read_file(file)

From fa316b861ec7959cf78f367eb0a244d278b439cf Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Mon, 26 May 2025 22:40:51 -0600
Subject: [PATCH 08/12] refactor: Make each arch case multiline

---
 nightly/alpine3.20/Dockerfile    | 20 ++++++++++++----
 nightly/alpine3.21/Dockerfile    | 20 ++++++++++++----
 nightly/alpine3.22/Dockerfile    | 20 ++++++++++++----
 nightly/bookworm/Dockerfile      | 35 ++++++++++++++++++++++------
 nightly/bookworm/slim/Dockerfile | 35 ++++++++++++++++++++++------
 nightly/bullseye/Dockerfile      | 25 ++++++++++++++++----
 nightly/bullseye/slim/Dockerfile | 25 ++++++++++++++++----
 nightly/trixie/Dockerfile        | 40 +++++++++++++++++++++++++-------
 nightly/trixie/slim/Dockerfile   | 40 +++++++++++++++++++++++++-------
 stable/alpine3.20/Dockerfile     | 20 ++++++++++++----
 stable/alpine3.21/Dockerfile     | 20 ++++++++++++----
 stable/alpine3.22/Dockerfile     | 20 ++++++++++++----
 stable/bookworm/Dockerfile       | 35 ++++++++++++++++++++++------
 stable/bookworm/slim/Dockerfile  | 35 ++++++++++++++++++++++------
 stable/bullseye/Dockerfile       | 25 ++++++++++++++++----
 stable/bullseye/slim/Dockerfile  | 25 ++++++++++++++++----
 stable/trixie/Dockerfile         | 40 +++++++++++++++++++++++++-------
 stable/trixie/slim/Dockerfile    | 40 +++++++++++++++++++++++++-------
 x.py                             | 12 ++++++++--
 19 files changed, 426 insertions(+), 106 deletions(-)

diff --git a/nightly/alpine3.20/Dockerfile b/nightly/alpine3.20/Dockerfile
index febf04b..0caa27c 100644
--- a/nightly/alpine3.20/Dockerfile
+++ b/nightly/alpine3.20/Dockerfile
@@ -14,10 +14,22 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(apk --print-arch)"; \
     case "$arch" in \
-        x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
-        aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
-        ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
-        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
+        x86_64) \
+            rustArch='x86_64-unknown-linux-musl'; \
+            rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2'; \
+            ;; \
+        aarch64) \
+            rustArch='aarch64-unknown-linux-musl'; \
+            rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9'; \
+            ;; \
+        ppc64le) \
+            rustArch='powerpc64le-unknown-linux-musl'; \
+            rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1'; \
+            ;; \
+        *) \
+            echo >&2 "unsupported architecture: $arch"; \
+            exit 1; \
+            ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/nightly/alpine3.21/Dockerfile b/nightly/alpine3.21/Dockerfile
index 1090b32..3cc9678 100644
--- a/nightly/alpine3.21/Dockerfile
+++ b/nightly/alpine3.21/Dockerfile
@@ -14,10 +14,22 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(apk --print-arch)"; \
     case "$arch" in \
-        x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
-        aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
-        ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
-        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
+        x86_64) \
+            rustArch='x86_64-unknown-linux-musl'; \
+            rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2'; \
+            ;; \
+        aarch64) \
+            rustArch='aarch64-unknown-linux-musl'; \
+            rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9'; \
+            ;; \
+        ppc64le) \
+            rustArch='powerpc64le-unknown-linux-musl'; \
+            rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1'; \
+            ;; \
+        *) \
+            echo >&2 "unsupported architecture: $arch"; \
+            exit 1; \
+            ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/nightly/alpine3.22/Dockerfile b/nightly/alpine3.22/Dockerfile
index 1d8895f..72211d3 100644
--- a/nightly/alpine3.22/Dockerfile
+++ b/nightly/alpine3.22/Dockerfile
@@ -14,10 +14,22 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(apk --print-arch)"; \
     case "$arch" in \
-        x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
-        aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
-        ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
-        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
+        x86_64) \
+            rustArch='x86_64-unknown-linux-musl'; \
+            rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2'; \
+            ;; \
+        aarch64) \
+            rustArch='aarch64-unknown-linux-musl'; \
+            rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9'; \
+            ;; \
+        ppc64le) \
+            rustArch='powerpc64le-unknown-linux-musl'; \
+            rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1'; \
+            ;; \
+        *) \
+            echo >&2 "unsupported architecture: $arch"; \
+            exit 1; \
+            ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/nightly/bookworm/Dockerfile b/nightly/bookworm/Dockerfile
index 475ca2b..feb1066 100644
--- a/nightly/bookworm/Dockerfile
+++ b/nightly/bookworm/Dockerfile
@@ -10,13 +10,34 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
-        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
-        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
-        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
-        ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
-        s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
-        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
+        amd64) \
+            rustArch='x86_64-unknown-linux-gnu'; \
+            rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
+            ;; \
+        armhf) \
+            rustArch='armv7-unknown-linux-gnueabihf'; \
+            rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
+            ;; \
+        arm64) \
+            rustArch='aarch64-unknown-linux-gnu'; \
+            rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
+            ;; \
+        i386) \
+            rustArch='i686-unknown-linux-gnu'; \
+            rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
+            ;; \
+        ppc64el) \
+            rustArch='powerpc64le-unknown-linux-gnu'; \
+            rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0'; \
+            ;; \
+        s390x) \
+            rustArch='s390x-unknown-linux-gnu'; \
+            rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572'; \
+            ;; \
+        *) \
+            echo >&2 "unsupported architecture: $arch"; \
+            exit 1; \
+            ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/nightly/bookworm/slim/Dockerfile b/nightly/bookworm/slim/Dockerfile
index fe032d2..84e033c 100644
--- a/nightly/bookworm/slim/Dockerfile
+++ b/nightly/bookworm/slim/Dockerfile
@@ -17,13 +17,34 @@ RUN set -eux; \
         ; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
-        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
-        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
-        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
-        ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
-        s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
-        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
+        amd64) \
+            rustArch='x86_64-unknown-linux-gnu'; \
+            rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
+            ;; \
+        armhf) \
+            rustArch='armv7-unknown-linux-gnueabihf'; \
+            rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
+            ;; \
+        arm64) \
+            rustArch='aarch64-unknown-linux-gnu'; \
+            rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
+            ;; \
+        i386) \
+            rustArch='i686-unknown-linux-gnu'; \
+            rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
+            ;; \
+        ppc64el) \
+            rustArch='powerpc64le-unknown-linux-gnu'; \
+            rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0'; \
+            ;; \
+        s390x) \
+            rustArch='s390x-unknown-linux-gnu'; \
+            rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572'; \
+            ;; \
+        *) \
+            echo >&2 "unsupported architecture: $arch"; \
+            exit 1; \
+            ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/nightly/bullseye/Dockerfile b/nightly/bullseye/Dockerfile
index f88b793..110b713 100644
--- a/nightly/bullseye/Dockerfile
+++ b/nightly/bullseye/Dockerfile
@@ -10,11 +10,26 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
-        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
-        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
-        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
-        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
+        amd64) \
+            rustArch='x86_64-unknown-linux-gnu'; \
+            rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
+            ;; \
+        armhf) \
+            rustArch='armv7-unknown-linux-gnueabihf'; \
+            rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
+            ;; \
+        arm64) \
+            rustArch='aarch64-unknown-linux-gnu'; \
+            rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
+            ;; \
+        i386) \
+            rustArch='i686-unknown-linux-gnu'; \
+            rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
+            ;; \
+        *) \
+            echo >&2 "unsupported architecture: $arch"; \
+            exit 1; \
+            ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/nightly/bullseye/slim/Dockerfile b/nightly/bullseye/slim/Dockerfile
index 774eed0..9958c77 100644
--- a/nightly/bullseye/slim/Dockerfile
+++ b/nightly/bullseye/slim/Dockerfile
@@ -17,11 +17,26 @@ RUN set -eux; \
         ; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
-        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
-        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
-        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
-        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
+        amd64) \
+            rustArch='x86_64-unknown-linux-gnu'; \
+            rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
+            ;; \
+        armhf) \
+            rustArch='armv7-unknown-linux-gnueabihf'; \
+            rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
+            ;; \
+        arm64) \
+            rustArch='aarch64-unknown-linux-gnu'; \
+            rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
+            ;; \
+        i386) \
+            rustArch='i686-unknown-linux-gnu'; \
+            rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
+            ;; \
+        *) \
+            echo >&2 "unsupported architecture: $arch"; \
+            exit 1; \
+            ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/nightly/trixie/Dockerfile b/nightly/trixie/Dockerfile
index 24fd02c..5446d72 100644
--- a/nightly/trixie/Dockerfile
+++ b/nightly/trixie/Dockerfile
@@ -10,14 +10,38 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
-        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
-        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
-        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
-        ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
-        s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
-        riscv64) rustArch='riscv64gc-unknown-linux-gnu'; rustupSha256='09e64cc1b7a3e99adaa15dd2d46a3aad9d44d71041e2a96100d165c98a8fd7a7' ;; \
-        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
+        amd64) \
+            rustArch='x86_64-unknown-linux-gnu'; \
+            rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
+            ;; \
+        armhf) \
+            rustArch='armv7-unknown-linux-gnueabihf'; \
+            rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
+            ;; \
+        arm64) \
+            rustArch='aarch64-unknown-linux-gnu'; \
+            rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
+            ;; \
+        i386) \
+            rustArch='i686-unknown-linux-gnu'; \
+            rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
+            ;; \
+        ppc64el) \
+            rustArch='powerpc64le-unknown-linux-gnu'; \
+            rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0'; \
+            ;; \
+        s390x) \
+            rustArch='s390x-unknown-linux-gnu'; \
+            rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572'; \
+            ;; \
+        riscv64) \
+            rustArch='riscv64gc-unknown-linux-gnu'; \
+            rustupSha256='09e64cc1b7a3e99adaa15dd2d46a3aad9d44d71041e2a96100d165c98a8fd7a7'; \
+            ;; \
+        *) \
+            echo >&2 "unsupported architecture: $arch"; \
+            exit 1; \
+            ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/nightly/trixie/slim/Dockerfile b/nightly/trixie/slim/Dockerfile
index 2eeb9f9..1371b87 100644
--- a/nightly/trixie/slim/Dockerfile
+++ b/nightly/trixie/slim/Dockerfile
@@ -17,14 +17,38 @@ RUN set -eux; \
         ; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
-        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
-        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
-        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
-        ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
-        s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
-        riscv64) rustArch='riscv64gc-unknown-linux-gnu'; rustupSha256='09e64cc1b7a3e99adaa15dd2d46a3aad9d44d71041e2a96100d165c98a8fd7a7' ;; \
-        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
+        amd64) \
+            rustArch='x86_64-unknown-linux-gnu'; \
+            rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
+            ;; \
+        armhf) \
+            rustArch='armv7-unknown-linux-gnueabihf'; \
+            rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
+            ;; \
+        arm64) \
+            rustArch='aarch64-unknown-linux-gnu'; \
+            rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
+            ;; \
+        i386) \
+            rustArch='i686-unknown-linux-gnu'; \
+            rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
+            ;; \
+        ppc64el) \
+            rustArch='powerpc64le-unknown-linux-gnu'; \
+            rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0'; \
+            ;; \
+        s390x) \
+            rustArch='s390x-unknown-linux-gnu'; \
+            rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572'; \
+            ;; \
+        riscv64) \
+            rustArch='riscv64gc-unknown-linux-gnu'; \
+            rustupSha256='09e64cc1b7a3e99adaa15dd2d46a3aad9d44d71041e2a96100d165c98a8fd7a7'; \
+            ;; \
+        *) \
+            echo >&2 "unsupported architecture: $arch"; \
+            exit 1; \
+            ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/stable/alpine3.20/Dockerfile b/stable/alpine3.20/Dockerfile
index d0ed698..47bca41 100644
--- a/stable/alpine3.20/Dockerfile
+++ b/stable/alpine3.20/Dockerfile
@@ -14,10 +14,22 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(apk --print-arch)"; \
     case "$arch" in \
-        x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
-        aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
-        ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
-        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
+        x86_64) \
+            rustArch='x86_64-unknown-linux-musl'; \
+            rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2'; \
+            ;; \
+        aarch64) \
+            rustArch='aarch64-unknown-linux-musl'; \
+            rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9'; \
+            ;; \
+        ppc64le) \
+            rustArch='powerpc64le-unknown-linux-musl'; \
+            rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1'; \
+            ;; \
+        *) \
+            echo >&2 "unsupported architecture: $arch"; \
+            exit 1; \
+            ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/stable/alpine3.21/Dockerfile b/stable/alpine3.21/Dockerfile
index 6c50340..8f0913e 100644
--- a/stable/alpine3.21/Dockerfile
+++ b/stable/alpine3.21/Dockerfile
@@ -14,10 +14,22 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(apk --print-arch)"; \
     case "$arch" in \
-        x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
-        aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
-        ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
-        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
+        x86_64) \
+            rustArch='x86_64-unknown-linux-musl'; \
+            rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2'; \
+            ;; \
+        aarch64) \
+            rustArch='aarch64-unknown-linux-musl'; \
+            rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9'; \
+            ;; \
+        ppc64le) \
+            rustArch='powerpc64le-unknown-linux-musl'; \
+            rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1'; \
+            ;; \
+        *) \
+            echo >&2 "unsupported architecture: $arch"; \
+            exit 1; \
+            ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/stable/alpine3.22/Dockerfile b/stable/alpine3.22/Dockerfile
index d59d030..b2ba45b 100644
--- a/stable/alpine3.22/Dockerfile
+++ b/stable/alpine3.22/Dockerfile
@@ -14,10 +14,22 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(apk --print-arch)"; \
     case "$arch" in \
-        x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \
-        aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \
-        ppc64le) rustArch='powerpc64le-unknown-linux-musl'; rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1' ;; \
-        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
+        x86_64) \
+            rustArch='x86_64-unknown-linux-musl'; \
+            rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2'; \
+            ;; \
+        aarch64) \
+            rustArch='aarch64-unknown-linux-musl'; \
+            rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9'; \
+            ;; \
+        ppc64le) \
+            rustArch='powerpc64le-unknown-linux-musl'; \
+            rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1'; \
+            ;; \
+        *) \
+            echo >&2 "unsupported architecture: $arch"; \
+            exit 1; \
+            ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/stable/bookworm/Dockerfile b/stable/bookworm/Dockerfile
index 1fbf89d..cc98ef5 100644
--- a/stable/bookworm/Dockerfile
+++ b/stable/bookworm/Dockerfile
@@ -10,13 +10,34 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
-        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
-        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
-        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
-        ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
-        s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
-        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
+        amd64) \
+            rustArch='x86_64-unknown-linux-gnu'; \
+            rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
+            ;; \
+        armhf) \
+            rustArch='armv7-unknown-linux-gnueabihf'; \
+            rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
+            ;; \
+        arm64) \
+            rustArch='aarch64-unknown-linux-gnu'; \
+            rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
+            ;; \
+        i386) \
+            rustArch='i686-unknown-linux-gnu'; \
+            rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
+            ;; \
+        ppc64el) \
+            rustArch='powerpc64le-unknown-linux-gnu'; \
+            rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0'; \
+            ;; \
+        s390x) \
+            rustArch='s390x-unknown-linux-gnu'; \
+            rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572'; \
+            ;; \
+        *) \
+            echo >&2 "unsupported architecture: $arch"; \
+            exit 1; \
+            ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/stable/bookworm/slim/Dockerfile b/stable/bookworm/slim/Dockerfile
index 15ff2ee..7454769 100644
--- a/stable/bookworm/slim/Dockerfile
+++ b/stable/bookworm/slim/Dockerfile
@@ -17,13 +17,34 @@ RUN set -eux; \
         ; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
-        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
-        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
-        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
-        ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
-        s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
-        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
+        amd64) \
+            rustArch='x86_64-unknown-linux-gnu'; \
+            rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
+            ;; \
+        armhf) \
+            rustArch='armv7-unknown-linux-gnueabihf'; \
+            rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
+            ;; \
+        arm64) \
+            rustArch='aarch64-unknown-linux-gnu'; \
+            rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
+            ;; \
+        i386) \
+            rustArch='i686-unknown-linux-gnu'; \
+            rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
+            ;; \
+        ppc64el) \
+            rustArch='powerpc64le-unknown-linux-gnu'; \
+            rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0'; \
+            ;; \
+        s390x) \
+            rustArch='s390x-unknown-linux-gnu'; \
+            rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572'; \
+            ;; \
+        *) \
+            echo >&2 "unsupported architecture: $arch"; \
+            exit 1; \
+            ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/stable/bullseye/Dockerfile b/stable/bullseye/Dockerfile
index 1be0155..86894e0 100644
--- a/stable/bullseye/Dockerfile
+++ b/stable/bullseye/Dockerfile
@@ -10,11 +10,26 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
-        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
-        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
-        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
-        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
+        amd64) \
+            rustArch='x86_64-unknown-linux-gnu'; \
+            rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
+            ;; \
+        armhf) \
+            rustArch='armv7-unknown-linux-gnueabihf'; \
+            rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
+            ;; \
+        arm64) \
+            rustArch='aarch64-unknown-linux-gnu'; \
+            rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
+            ;; \
+        i386) \
+            rustArch='i686-unknown-linux-gnu'; \
+            rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
+            ;; \
+        *) \
+            echo >&2 "unsupported architecture: $arch"; \
+            exit 1; \
+            ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/stable/bullseye/slim/Dockerfile b/stable/bullseye/slim/Dockerfile
index 044a4e5..19481a8 100644
--- a/stable/bullseye/slim/Dockerfile
+++ b/stable/bullseye/slim/Dockerfile
@@ -17,11 +17,26 @@ RUN set -eux; \
         ; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
-        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
-        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
-        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
-        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
+        amd64) \
+            rustArch='x86_64-unknown-linux-gnu'; \
+            rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
+            ;; \
+        armhf) \
+            rustArch='armv7-unknown-linux-gnueabihf'; \
+            rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
+            ;; \
+        arm64) \
+            rustArch='aarch64-unknown-linux-gnu'; \
+            rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
+            ;; \
+        i386) \
+            rustArch='i686-unknown-linux-gnu'; \
+            rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
+            ;; \
+        *) \
+            echo >&2 "unsupported architecture: $arch"; \
+            exit 1; \
+            ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/stable/trixie/Dockerfile b/stable/trixie/Dockerfile
index 8879c0d..c754251 100644
--- a/stable/trixie/Dockerfile
+++ b/stable/trixie/Dockerfile
@@ -10,14 +10,38 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
-        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
-        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
-        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
-        ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
-        s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
-        riscv64) rustArch='riscv64gc-unknown-linux-gnu'; rustupSha256='09e64cc1b7a3e99adaa15dd2d46a3aad9d44d71041e2a96100d165c98a8fd7a7' ;; \
-        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
+        amd64) \
+            rustArch='x86_64-unknown-linux-gnu'; \
+            rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
+            ;; \
+        armhf) \
+            rustArch='armv7-unknown-linux-gnueabihf'; \
+            rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
+            ;; \
+        arm64) \
+            rustArch='aarch64-unknown-linux-gnu'; \
+            rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
+            ;; \
+        i386) \
+            rustArch='i686-unknown-linux-gnu'; \
+            rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
+            ;; \
+        ppc64el) \
+            rustArch='powerpc64le-unknown-linux-gnu'; \
+            rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0'; \
+            ;; \
+        s390x) \
+            rustArch='s390x-unknown-linux-gnu'; \
+            rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572'; \
+            ;; \
+        riscv64) \
+            rustArch='riscv64gc-unknown-linux-gnu'; \
+            rustupSha256='09e64cc1b7a3e99adaa15dd2d46a3aad9d44d71041e2a96100d165c98a8fd7a7'; \
+            ;; \
+        *) \
+            echo >&2 "unsupported architecture: $arch"; \
+            exit 1; \
+            ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/stable/trixie/slim/Dockerfile b/stable/trixie/slim/Dockerfile
index 80cf4d0..8452ea2 100644
--- a/stable/trixie/slim/Dockerfile
+++ b/stable/trixie/slim/Dockerfile
@@ -17,14 +17,38 @@ RUN set -eux; \
         ; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \
-        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61' ;; \
-        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \
-        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f' ;; \
-        ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0' ;; \
-        s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572' ;; \
-        riscv64) rustArch='riscv64gc-unknown-linux-gnu'; rustupSha256='09e64cc1b7a3e99adaa15dd2d46a3aad9d44d71041e2a96100d165c98a8fd7a7' ;; \
-        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \
+        amd64) \
+            rustArch='x86_64-unknown-linux-gnu'; \
+            rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
+            ;; \
+        armhf) \
+            rustArch='armv7-unknown-linux-gnueabihf'; \
+            rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
+            ;; \
+        arm64) \
+            rustArch='aarch64-unknown-linux-gnu'; \
+            rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
+            ;; \
+        i386) \
+            rustArch='i686-unknown-linux-gnu'; \
+            rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
+            ;; \
+        ppc64el) \
+            rustArch='powerpc64le-unknown-linux-gnu'; \
+            rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0'; \
+            ;; \
+        s390x) \
+            rustArch='s390x-unknown-linux-gnu'; \
+            rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572'; \
+            ;; \
+        riscv64) \
+            rustArch='riscv64gc-unknown-linux-gnu'; \
+            rustupSha256='09e64cc1b7a3e99adaa15dd2d46a3aad9d44d71041e2a96100d165c98a8fd7a7'; \
+            ;; \
+        *) \
+            echo >&2 "unsupported architecture: $arch"; \
+            exit 1; \
+            ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
diff --git a/x.py b/x.py
index 86fdad1..1a8bafb 100755
--- a/x.py
+++ b/x.py
@@ -121,13 +121,21 @@ def arch_cases_start(arch_cmd):
     return start
 
 def arch_cases_end():
-    end = '        *) echo >&2 "unsupported architecture: $arch"; exit 1 ;; \\\n'
+    end = ''
+    end += '        *) \\\n'
+    end += '            echo >&2 "unsupported architecture: $arch"; \\\n'
+    end += '            exit 1; \\\n'
+    end += '            ;; \\\n'
     end += '    esac'
     return end
 
 def arch_case(distro_arch, rust_arch):
     rustup_sha256 = rustup_hash(rust_arch)
-    return f"        {distro_arch}) rustArch='{rust_arch}'; rustupSha256='{rustup_sha256}' ;; \\\n"
+    arch_case_str = f"        {distro_arch}) \\\n"
+    arch_case_str += f"            rustArch='{rust_arch}'; \\\n"
+    arch_case_str += f"            rustupSha256='{rustup_sha256}'; \\\n"
+    arch_case_str += "            ;; \\\n"
+    return arch_case_str
 
 def render_template(
     template_path,

From 0090aa71b570edfb7464fb7a380d32b6ed4b3c10 Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Mon, 26 May 2025 22:42:47 -0600
Subject: [PATCH 09/12] refactor: Add quotes around each arch case

---
 nightly/alpine3.20/Dockerfile    |  6 +++---
 nightly/alpine3.21/Dockerfile    |  6 +++---
 nightly/alpine3.22/Dockerfile    |  6 +++---
 nightly/bookworm/Dockerfile      | 12 ++++++------
 nightly/bookworm/slim/Dockerfile | 12 ++++++------
 nightly/bullseye/Dockerfile      |  8 ++++----
 nightly/bullseye/slim/Dockerfile |  8 ++++----
 nightly/trixie/Dockerfile        | 14 +++++++-------
 nightly/trixie/slim/Dockerfile   | 14 +++++++-------
 stable/alpine3.20/Dockerfile     |  6 +++---
 stable/alpine3.21/Dockerfile     |  6 +++---
 stable/alpine3.22/Dockerfile     |  6 +++---
 stable/bookworm/Dockerfile       | 12 ++++++------
 stable/bookworm/slim/Dockerfile  | 12 ++++++------
 stable/bullseye/Dockerfile       |  8 ++++----
 stable/bullseye/slim/Dockerfile  |  8 ++++----
 stable/trixie/Dockerfile         | 14 +++++++-------
 stable/trixie/slim/Dockerfile    | 14 +++++++-------
 x.py                             |  2 +-
 19 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/nightly/alpine3.20/Dockerfile b/nightly/alpine3.20/Dockerfile
index 0caa27c..0bfad20 100644
--- a/nightly/alpine3.20/Dockerfile
+++ b/nightly/alpine3.20/Dockerfile
@@ -14,15 +14,15 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(apk --print-arch)"; \
     case "$arch" in \
-        x86_64) \
+        'x86_64') \
             rustArch='x86_64-unknown-linux-musl'; \
             rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2'; \
             ;; \
-        aarch64) \
+        'aarch64') \
             rustArch='aarch64-unknown-linux-musl'; \
             rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9'; \
             ;; \
-        ppc64le) \
+        'ppc64le') \
             rustArch='powerpc64le-unknown-linux-musl'; \
             rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1'; \
             ;; \
diff --git a/nightly/alpine3.21/Dockerfile b/nightly/alpine3.21/Dockerfile
index 3cc9678..83bee45 100644
--- a/nightly/alpine3.21/Dockerfile
+++ b/nightly/alpine3.21/Dockerfile
@@ -14,15 +14,15 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(apk --print-arch)"; \
     case "$arch" in \
-        x86_64) \
+        'x86_64') \
             rustArch='x86_64-unknown-linux-musl'; \
             rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2'; \
             ;; \
-        aarch64) \
+        'aarch64') \
             rustArch='aarch64-unknown-linux-musl'; \
             rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9'; \
             ;; \
-        ppc64le) \
+        'ppc64le') \
             rustArch='powerpc64le-unknown-linux-musl'; \
             rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1'; \
             ;; \
diff --git a/nightly/alpine3.22/Dockerfile b/nightly/alpine3.22/Dockerfile
index 72211d3..9e318df 100644
--- a/nightly/alpine3.22/Dockerfile
+++ b/nightly/alpine3.22/Dockerfile
@@ -14,15 +14,15 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(apk --print-arch)"; \
     case "$arch" in \
-        x86_64) \
+        'x86_64') \
             rustArch='x86_64-unknown-linux-musl'; \
             rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2'; \
             ;; \
-        aarch64) \
+        'aarch64') \
             rustArch='aarch64-unknown-linux-musl'; \
             rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9'; \
             ;; \
-        ppc64le) \
+        'ppc64le') \
             rustArch='powerpc64le-unknown-linux-musl'; \
             rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1'; \
             ;; \
diff --git a/nightly/bookworm/Dockerfile b/nightly/bookworm/Dockerfile
index feb1066..4bf757a 100644
--- a/nightly/bookworm/Dockerfile
+++ b/nightly/bookworm/Dockerfile
@@ -10,27 +10,27 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) \
+        'amd64') \
             rustArch='x86_64-unknown-linux-gnu'; \
             rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
             ;; \
-        armhf) \
+        'armhf') \
             rustArch='armv7-unknown-linux-gnueabihf'; \
             rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
             ;; \
-        arm64) \
+        'arm64') \
             rustArch='aarch64-unknown-linux-gnu'; \
             rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
             ;; \
-        i386) \
+        'i386') \
             rustArch='i686-unknown-linux-gnu'; \
             rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
             ;; \
-        ppc64el) \
+        'ppc64el') \
             rustArch='powerpc64le-unknown-linux-gnu'; \
             rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0'; \
             ;; \
-        s390x) \
+        's390x') \
             rustArch='s390x-unknown-linux-gnu'; \
             rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572'; \
             ;; \
diff --git a/nightly/bookworm/slim/Dockerfile b/nightly/bookworm/slim/Dockerfile
index 84e033c..b97e36c 100644
--- a/nightly/bookworm/slim/Dockerfile
+++ b/nightly/bookworm/slim/Dockerfile
@@ -17,27 +17,27 @@ RUN set -eux; \
         ; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) \
+        'amd64') \
             rustArch='x86_64-unknown-linux-gnu'; \
             rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
             ;; \
-        armhf) \
+        'armhf') \
             rustArch='armv7-unknown-linux-gnueabihf'; \
             rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
             ;; \
-        arm64) \
+        'arm64') \
             rustArch='aarch64-unknown-linux-gnu'; \
             rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
             ;; \
-        i386) \
+        'i386') \
             rustArch='i686-unknown-linux-gnu'; \
             rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
             ;; \
-        ppc64el) \
+        'ppc64el') \
             rustArch='powerpc64le-unknown-linux-gnu'; \
             rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0'; \
             ;; \
-        s390x) \
+        's390x') \
             rustArch='s390x-unknown-linux-gnu'; \
             rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572'; \
             ;; \
diff --git a/nightly/bullseye/Dockerfile b/nightly/bullseye/Dockerfile
index 110b713..6478d04 100644
--- a/nightly/bullseye/Dockerfile
+++ b/nightly/bullseye/Dockerfile
@@ -10,19 +10,19 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) \
+        'amd64') \
             rustArch='x86_64-unknown-linux-gnu'; \
             rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
             ;; \
-        armhf) \
+        'armhf') \
             rustArch='armv7-unknown-linux-gnueabihf'; \
             rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
             ;; \
-        arm64) \
+        'arm64') \
             rustArch='aarch64-unknown-linux-gnu'; \
             rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
             ;; \
-        i386) \
+        'i386') \
             rustArch='i686-unknown-linux-gnu'; \
             rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
             ;; \
diff --git a/nightly/bullseye/slim/Dockerfile b/nightly/bullseye/slim/Dockerfile
index 9958c77..4129f64 100644
--- a/nightly/bullseye/slim/Dockerfile
+++ b/nightly/bullseye/slim/Dockerfile
@@ -17,19 +17,19 @@ RUN set -eux; \
         ; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) \
+        'amd64') \
             rustArch='x86_64-unknown-linux-gnu'; \
             rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
             ;; \
-        armhf) \
+        'armhf') \
             rustArch='armv7-unknown-linux-gnueabihf'; \
             rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
             ;; \
-        arm64) \
+        'arm64') \
             rustArch='aarch64-unknown-linux-gnu'; \
             rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
             ;; \
-        i386) \
+        'i386') \
             rustArch='i686-unknown-linux-gnu'; \
             rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
             ;; \
diff --git a/nightly/trixie/Dockerfile b/nightly/trixie/Dockerfile
index 5446d72..1072ae0 100644
--- a/nightly/trixie/Dockerfile
+++ b/nightly/trixie/Dockerfile
@@ -10,31 +10,31 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) \
+        'amd64') \
             rustArch='x86_64-unknown-linux-gnu'; \
             rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
             ;; \
-        armhf) \
+        'armhf') \
             rustArch='armv7-unknown-linux-gnueabihf'; \
             rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
             ;; \
-        arm64) \
+        'arm64') \
             rustArch='aarch64-unknown-linux-gnu'; \
             rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
             ;; \
-        i386) \
+        'i386') \
             rustArch='i686-unknown-linux-gnu'; \
             rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
             ;; \
-        ppc64el) \
+        'ppc64el') \
             rustArch='powerpc64le-unknown-linux-gnu'; \
             rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0'; \
             ;; \
-        s390x) \
+        's390x') \
             rustArch='s390x-unknown-linux-gnu'; \
             rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572'; \
             ;; \
-        riscv64) \
+        'riscv64') \
             rustArch='riscv64gc-unknown-linux-gnu'; \
             rustupSha256='09e64cc1b7a3e99adaa15dd2d46a3aad9d44d71041e2a96100d165c98a8fd7a7'; \
             ;; \
diff --git a/nightly/trixie/slim/Dockerfile b/nightly/trixie/slim/Dockerfile
index 1371b87..db78027 100644
--- a/nightly/trixie/slim/Dockerfile
+++ b/nightly/trixie/slim/Dockerfile
@@ -17,31 +17,31 @@ RUN set -eux; \
         ; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) \
+        'amd64') \
             rustArch='x86_64-unknown-linux-gnu'; \
             rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
             ;; \
-        armhf) \
+        'armhf') \
             rustArch='armv7-unknown-linux-gnueabihf'; \
             rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
             ;; \
-        arm64) \
+        'arm64') \
             rustArch='aarch64-unknown-linux-gnu'; \
             rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
             ;; \
-        i386) \
+        'i386') \
             rustArch='i686-unknown-linux-gnu'; \
             rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
             ;; \
-        ppc64el) \
+        'ppc64el') \
             rustArch='powerpc64le-unknown-linux-gnu'; \
             rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0'; \
             ;; \
-        s390x) \
+        's390x') \
             rustArch='s390x-unknown-linux-gnu'; \
             rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572'; \
             ;; \
-        riscv64) \
+        'riscv64') \
             rustArch='riscv64gc-unknown-linux-gnu'; \
             rustupSha256='09e64cc1b7a3e99adaa15dd2d46a3aad9d44d71041e2a96100d165c98a8fd7a7'; \
             ;; \
diff --git a/stable/alpine3.20/Dockerfile b/stable/alpine3.20/Dockerfile
index 47bca41..4376354 100644
--- a/stable/alpine3.20/Dockerfile
+++ b/stable/alpine3.20/Dockerfile
@@ -14,15 +14,15 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(apk --print-arch)"; \
     case "$arch" in \
-        x86_64) \
+        'x86_64') \
             rustArch='x86_64-unknown-linux-musl'; \
             rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2'; \
             ;; \
-        aarch64) \
+        'aarch64') \
             rustArch='aarch64-unknown-linux-musl'; \
             rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9'; \
             ;; \
-        ppc64le) \
+        'ppc64le') \
             rustArch='powerpc64le-unknown-linux-musl'; \
             rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1'; \
             ;; \
diff --git a/stable/alpine3.21/Dockerfile b/stable/alpine3.21/Dockerfile
index 8f0913e..51b9f30 100644
--- a/stable/alpine3.21/Dockerfile
+++ b/stable/alpine3.21/Dockerfile
@@ -14,15 +14,15 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(apk --print-arch)"; \
     case "$arch" in \
-        x86_64) \
+        'x86_64') \
             rustArch='x86_64-unknown-linux-musl'; \
             rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2'; \
             ;; \
-        aarch64) \
+        'aarch64') \
             rustArch='aarch64-unknown-linux-musl'; \
             rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9'; \
             ;; \
-        ppc64le) \
+        'ppc64le') \
             rustArch='powerpc64le-unknown-linux-musl'; \
             rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1'; \
             ;; \
diff --git a/stable/alpine3.22/Dockerfile b/stable/alpine3.22/Dockerfile
index b2ba45b..94c7d52 100644
--- a/stable/alpine3.22/Dockerfile
+++ b/stable/alpine3.22/Dockerfile
@@ -14,15 +14,15 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(apk --print-arch)"; \
     case "$arch" in \
-        x86_64) \
+        'x86_64') \
             rustArch='x86_64-unknown-linux-musl'; \
             rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2'; \
             ;; \
-        aarch64) \
+        'aarch64') \
             rustArch='aarch64-unknown-linux-musl'; \
             rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9'; \
             ;; \
-        ppc64le) \
+        'ppc64le') \
             rustArch='powerpc64le-unknown-linux-musl'; \
             rustupSha256='08423383d36362d93f8d85f208aa5004a7cef77b69b29fb779ba03ed0544e4f1'; \
             ;; \
diff --git a/stable/bookworm/Dockerfile b/stable/bookworm/Dockerfile
index cc98ef5..5dc8313 100644
--- a/stable/bookworm/Dockerfile
+++ b/stable/bookworm/Dockerfile
@@ -10,27 +10,27 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) \
+        'amd64') \
             rustArch='x86_64-unknown-linux-gnu'; \
             rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
             ;; \
-        armhf) \
+        'armhf') \
             rustArch='armv7-unknown-linux-gnueabihf'; \
             rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
             ;; \
-        arm64) \
+        'arm64') \
             rustArch='aarch64-unknown-linux-gnu'; \
             rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
             ;; \
-        i386) \
+        'i386') \
             rustArch='i686-unknown-linux-gnu'; \
             rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
             ;; \
-        ppc64el) \
+        'ppc64el') \
             rustArch='powerpc64le-unknown-linux-gnu'; \
             rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0'; \
             ;; \
-        s390x) \
+        's390x') \
             rustArch='s390x-unknown-linux-gnu'; \
             rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572'; \
             ;; \
diff --git a/stable/bookworm/slim/Dockerfile b/stable/bookworm/slim/Dockerfile
index 7454769..bff40c9 100644
--- a/stable/bookworm/slim/Dockerfile
+++ b/stable/bookworm/slim/Dockerfile
@@ -17,27 +17,27 @@ RUN set -eux; \
         ; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) \
+        'amd64') \
             rustArch='x86_64-unknown-linux-gnu'; \
             rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
             ;; \
-        armhf) \
+        'armhf') \
             rustArch='armv7-unknown-linux-gnueabihf'; \
             rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
             ;; \
-        arm64) \
+        'arm64') \
             rustArch='aarch64-unknown-linux-gnu'; \
             rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
             ;; \
-        i386) \
+        'i386') \
             rustArch='i686-unknown-linux-gnu'; \
             rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
             ;; \
-        ppc64el) \
+        'ppc64el') \
             rustArch='powerpc64le-unknown-linux-gnu'; \
             rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0'; \
             ;; \
-        s390x) \
+        's390x') \
             rustArch='s390x-unknown-linux-gnu'; \
             rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572'; \
             ;; \
diff --git a/stable/bullseye/Dockerfile b/stable/bullseye/Dockerfile
index 86894e0..70ec52e 100644
--- a/stable/bullseye/Dockerfile
+++ b/stable/bullseye/Dockerfile
@@ -10,19 +10,19 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) \
+        'amd64') \
             rustArch='x86_64-unknown-linux-gnu'; \
             rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
             ;; \
-        armhf) \
+        'armhf') \
             rustArch='armv7-unknown-linux-gnueabihf'; \
             rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
             ;; \
-        arm64) \
+        'arm64') \
             rustArch='aarch64-unknown-linux-gnu'; \
             rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
             ;; \
-        i386) \
+        'i386') \
             rustArch='i686-unknown-linux-gnu'; \
             rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
             ;; \
diff --git a/stable/bullseye/slim/Dockerfile b/stable/bullseye/slim/Dockerfile
index 19481a8..9f8e82b 100644
--- a/stable/bullseye/slim/Dockerfile
+++ b/stable/bullseye/slim/Dockerfile
@@ -17,19 +17,19 @@ RUN set -eux; \
         ; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) \
+        'amd64') \
             rustArch='x86_64-unknown-linux-gnu'; \
             rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
             ;; \
-        armhf) \
+        'armhf') \
             rustArch='armv7-unknown-linux-gnueabihf'; \
             rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
             ;; \
-        arm64) \
+        'arm64') \
             rustArch='aarch64-unknown-linux-gnu'; \
             rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
             ;; \
-        i386) \
+        'i386') \
             rustArch='i686-unknown-linux-gnu'; \
             rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
             ;; \
diff --git a/stable/trixie/Dockerfile b/stable/trixie/Dockerfile
index c754251..e1e7917 100644
--- a/stable/trixie/Dockerfile
+++ b/stable/trixie/Dockerfile
@@ -10,31 +10,31 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) \
+        'amd64') \
             rustArch='x86_64-unknown-linux-gnu'; \
             rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
             ;; \
-        armhf) \
+        'armhf') \
             rustArch='armv7-unknown-linux-gnueabihf'; \
             rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
             ;; \
-        arm64) \
+        'arm64') \
             rustArch='aarch64-unknown-linux-gnu'; \
             rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
             ;; \
-        i386) \
+        'i386') \
             rustArch='i686-unknown-linux-gnu'; \
             rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
             ;; \
-        ppc64el) \
+        'ppc64el') \
             rustArch='powerpc64le-unknown-linux-gnu'; \
             rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0'; \
             ;; \
-        s390x) \
+        's390x') \
             rustArch='s390x-unknown-linux-gnu'; \
             rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572'; \
             ;; \
-        riscv64) \
+        'riscv64') \
             rustArch='riscv64gc-unknown-linux-gnu'; \
             rustupSha256='09e64cc1b7a3e99adaa15dd2d46a3aad9d44d71041e2a96100d165c98a8fd7a7'; \
             ;; \
diff --git a/stable/trixie/slim/Dockerfile b/stable/trixie/slim/Dockerfile
index 8452ea2..56100c9 100644
--- a/stable/trixie/slim/Dockerfile
+++ b/stable/trixie/slim/Dockerfile
@@ -17,31 +17,31 @@ RUN set -eux; \
         ; \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
-        amd64) \
+        'amd64') \
             rustArch='x86_64-unknown-linux-gnu'; \
             rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c'; \
             ;; \
-        armhf) \
+        'armhf') \
             rustArch='armv7-unknown-linux-gnueabihf'; \
             rustupSha256='3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61'; \
             ;; \
-        arm64) \
+        'arm64') \
             rustArch='aarch64-unknown-linux-gnu'; \
             rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c'; \
             ;; \
-        i386) \
+        'i386') \
             rustArch='i686-unknown-linux-gnu'; \
             rustupSha256='a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f'; \
             ;; \
-        ppc64el) \
+        'ppc64el') \
             rustArch='powerpc64le-unknown-linux-gnu'; \
             rustupSha256='acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0'; \
             ;; \
-        s390x) \
+        's390x') \
             rustArch='s390x-unknown-linux-gnu'; \
             rustupSha256='726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572'; \
             ;; \
-        riscv64) \
+        'riscv64') \
             rustArch='riscv64gc-unknown-linux-gnu'; \
             rustupSha256='09e64cc1b7a3e99adaa15dd2d46a3aad9d44d71041e2a96100d165c98a8fd7a7'; \
             ;; \
diff --git a/x.py b/x.py
index 1a8bafb..389f476 100755
--- a/x.py
+++ b/x.py
@@ -131,7 +131,7 @@ def arch_cases_end():
 
 def arch_case(distro_arch, rust_arch):
     rustup_sha256 = rustup_hash(rust_arch)
-    arch_case_str = f"        {distro_arch}) \\\n"
+    arch_case_str = f"        '{distro_arch}') \\\n"
     arch_case_str += f"            rustArch='{rust_arch}'; \\\n"
     arch_case_str += f"            rustupSha256='{rustup_sha256}'; \\\n"
     arch_case_str += "            ;; \\\n"

From 53ad4b5d208a4db9ce40fa7d178f4b8ec6494134 Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Mon, 26 May 2025 22:42:47 -0600
Subject: [PATCH 10/12] feat: Add dot progress bar

---
 Dockerfile-debian.template       | 2 +-
 Dockerfile-slim.template         | 2 +-
 nightly/bookworm/Dockerfile      | 2 +-
 nightly/bookworm/slim/Dockerfile | 2 +-
 nightly/bullseye/Dockerfile      | 2 +-
 nightly/bullseye/slim/Dockerfile | 2 +-
 nightly/trixie/Dockerfile        | 2 +-
 nightly/trixie/slim/Dockerfile   | 2 +-
 stable/bookworm/Dockerfile       | 2 +-
 stable/bookworm/slim/Dockerfile  | 2 +-
 stable/bullseye/Dockerfile       | 2 +-
 stable/bullseye/slim/Dockerfile  | 2 +-
 stable/trixie/Dockerfile         | 2 +-
 stable/trixie/slim/Dockerfile    | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index a58247d..bbb8ec7 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -10,7 +10,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN set -eux; \
     %%ARCH-CASE%%; \
     url="https://static.rust-lang.org/rustup/archive/%%RUSTUP-VERSION%%/${rustArch}/rustup-init"; \
-    wget "$url"; \
+    wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template
index 288d663..1ed4130 100644
--- a/Dockerfile-slim.template
+++ b/Dockerfile-slim.template
@@ -17,7 +17,7 @@ RUN set -eux; \
         ; \
     %%ARCH-CASE%%; \
     url="https://static.rust-lang.org/rustup/archive/%%RUSTUP-VERSION%%/${rustArch}/rustup-init"; \
-    wget "$url"; \
+    wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
diff --git a/nightly/bookworm/Dockerfile b/nightly/bookworm/Dockerfile
index 4bf757a..c4d66c3 100644
--- a/nightly/bookworm/Dockerfile
+++ b/nightly/bookworm/Dockerfile
@@ -40,7 +40,7 @@ RUN set -eux; \
             ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
-    wget "$url"; \
+    wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
diff --git a/nightly/bookworm/slim/Dockerfile b/nightly/bookworm/slim/Dockerfile
index b97e36c..a5148fc 100644
--- a/nightly/bookworm/slim/Dockerfile
+++ b/nightly/bookworm/slim/Dockerfile
@@ -47,7 +47,7 @@ RUN set -eux; \
             ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
-    wget "$url"; \
+    wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
diff --git a/nightly/bullseye/Dockerfile b/nightly/bullseye/Dockerfile
index 6478d04..697f31e 100644
--- a/nightly/bullseye/Dockerfile
+++ b/nightly/bullseye/Dockerfile
@@ -32,7 +32,7 @@ RUN set -eux; \
             ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
-    wget "$url"; \
+    wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
diff --git a/nightly/bullseye/slim/Dockerfile b/nightly/bullseye/slim/Dockerfile
index 4129f64..6ecdd45 100644
--- a/nightly/bullseye/slim/Dockerfile
+++ b/nightly/bullseye/slim/Dockerfile
@@ -39,7 +39,7 @@ RUN set -eux; \
             ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
-    wget "$url"; \
+    wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
diff --git a/nightly/trixie/Dockerfile b/nightly/trixie/Dockerfile
index 1072ae0..f93228e 100644
--- a/nightly/trixie/Dockerfile
+++ b/nightly/trixie/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
             ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
-    wget "$url"; \
+    wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
diff --git a/nightly/trixie/slim/Dockerfile b/nightly/trixie/slim/Dockerfile
index db78027..02ac427 100644
--- a/nightly/trixie/slim/Dockerfile
+++ b/nightly/trixie/slim/Dockerfile
@@ -51,7 +51,7 @@ RUN set -eux; \
             ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
-    wget "$url"; \
+    wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
diff --git a/stable/bookworm/Dockerfile b/stable/bookworm/Dockerfile
index 5dc8313..065c556 100644
--- a/stable/bookworm/Dockerfile
+++ b/stable/bookworm/Dockerfile
@@ -40,7 +40,7 @@ RUN set -eux; \
             ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
-    wget "$url"; \
+    wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
diff --git a/stable/bookworm/slim/Dockerfile b/stable/bookworm/slim/Dockerfile
index bff40c9..742fe02 100644
--- a/stable/bookworm/slim/Dockerfile
+++ b/stable/bookworm/slim/Dockerfile
@@ -47,7 +47,7 @@ RUN set -eux; \
             ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
-    wget "$url"; \
+    wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
diff --git a/stable/bullseye/Dockerfile b/stable/bullseye/Dockerfile
index 70ec52e..e00a382 100644
--- a/stable/bullseye/Dockerfile
+++ b/stable/bullseye/Dockerfile
@@ -32,7 +32,7 @@ RUN set -eux; \
             ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
-    wget "$url"; \
+    wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
diff --git a/stable/bullseye/slim/Dockerfile b/stable/bullseye/slim/Dockerfile
index 9f8e82b..500f5f7 100644
--- a/stable/bullseye/slim/Dockerfile
+++ b/stable/bullseye/slim/Dockerfile
@@ -39,7 +39,7 @@ RUN set -eux; \
             ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
-    wget "$url"; \
+    wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
diff --git a/stable/trixie/Dockerfile b/stable/trixie/Dockerfile
index e1e7917..57484e0 100644
--- a/stable/trixie/Dockerfile
+++ b/stable/trixie/Dockerfile
@@ -44,7 +44,7 @@ RUN set -eux; \
             ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
-    wget "$url"; \
+    wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
diff --git a/stable/trixie/slim/Dockerfile b/stable/trixie/slim/Dockerfile
index 56100c9..743fdf8 100644
--- a/stable/trixie/slim/Dockerfile
+++ b/stable/trixie/slim/Dockerfile
@@ -51,7 +51,7 @@ RUN set -eux; \
             ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
-    wget "$url"; \
+    wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \

From 9bb05e3ec335947c86ab71c3f8a021222f624b79 Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Mon, 26 May 2025 22:42:47 -0600
Subject: [PATCH 11/12] refactor: Group commands with extra whitespace

---
 Dockerfile-alpine.template       | 4 ++++
 Dockerfile-debian.template       | 4 ++++
 Dockerfile-slim.template         | 6 ++++++
 nightly/alpine3.20/Dockerfile    | 4 ++++
 nightly/alpine3.21/Dockerfile    | 4 ++++
 nightly/alpine3.22/Dockerfile    | 4 ++++
 nightly/bookworm/Dockerfile      | 4 ++++
 nightly/bookworm/slim/Dockerfile | 6 ++++++
 nightly/bullseye/Dockerfile      | 4 ++++
 nightly/bullseye/slim/Dockerfile | 6 ++++++
 nightly/trixie/Dockerfile        | 4 ++++
 nightly/trixie/slim/Dockerfile   | 6 ++++++
 stable/alpine3.20/Dockerfile     | 4 ++++
 stable/alpine3.21/Dockerfile     | 4 ++++
 stable/alpine3.22/Dockerfile     | 4 ++++
 stable/bookworm/Dockerfile       | 4 ++++
 stable/bookworm/slim/Dockerfile  | 6 ++++++
 stable/bullseye/Dockerfile       | 4 ++++
 stable/bullseye/slim/Dockerfile  | 6 ++++++
 stable/trixie/Dockerfile         | 4 ++++
 stable/trixie/slim/Dockerfile    | 6 ++++++
 21 files changed, 98 insertions(+)

diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 48d9397..7895767 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -12,14 +12,18 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=%%RUST-VERSION%%
 
 RUN set -eux; \
+    \
     %%ARCH-CASE%%; \
+    \
     url="https://static.rust-lang.org/rustup/archive/%%RUSTUP-VERSION%%/${rustArch}/rustup-init"; \
     wget "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version;
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index bbb8ec7..f12e088 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -8,14 +8,18 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=%%RUST-VERSION%%
 
 RUN set -eux; \
+    \
     %%ARCH-CASE%%; \
+    \
     url="https://static.rust-lang.org/rustup/archive/%%RUSTUP-VERSION%%/${rustArch}/rustup-init"; \
     wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version;
diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template
index 1ed4130..cc02a04 100644
--- a/Dockerfile-slim.template
+++ b/Dockerfile-slim.template
@@ -8,6 +8,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=%%RUST-VERSION%%
 
 RUN set -eux; \
+    \
     apt-get update; \
     apt-get install -y --no-install-recommends \
         ca-certificates \
@@ -15,17 +16,22 @@ RUN set -eux; \
         libc6-dev \
         wget \
         ; \
+    \
     %%ARCH-CASE%%; \
+    \
     url="https://static.rust-lang.org/rustup/archive/%%RUSTUP-VERSION%%/${rustArch}/rustup-init"; \
     wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version; \
+    \
     apt-get remove -y --auto-remove \
         wget \
         ; \
diff --git a/nightly/alpine3.20/Dockerfile b/nightly/alpine3.20/Dockerfile
index 0bfad20..6ab9633 100644
--- a/nightly/alpine3.20/Dockerfile
+++ b/nightly/alpine3.20/Dockerfile
@@ -12,6 +12,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=nightly
 
 RUN set -eux; \
+    \
     arch="$(apk --print-arch)"; \
     case "$arch" in \
         'x86_64') \
@@ -31,13 +32,16 @@ RUN set -eux; \
             exit 1; \
             ;; \
     esac; \
+    \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version;
diff --git a/nightly/alpine3.21/Dockerfile b/nightly/alpine3.21/Dockerfile
index 83bee45..ebe5025 100644
--- a/nightly/alpine3.21/Dockerfile
+++ b/nightly/alpine3.21/Dockerfile
@@ -12,6 +12,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=nightly
 
 RUN set -eux; \
+    \
     arch="$(apk --print-arch)"; \
     case "$arch" in \
         'x86_64') \
@@ -31,13 +32,16 @@ RUN set -eux; \
             exit 1; \
             ;; \
     esac; \
+    \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version;
diff --git a/nightly/alpine3.22/Dockerfile b/nightly/alpine3.22/Dockerfile
index 9e318df..e6b406e 100644
--- a/nightly/alpine3.22/Dockerfile
+++ b/nightly/alpine3.22/Dockerfile
@@ -12,6 +12,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=nightly
 
 RUN set -eux; \
+    \
     arch="$(apk --print-arch)"; \
     case "$arch" in \
         'x86_64') \
@@ -31,13 +32,16 @@ RUN set -eux; \
             exit 1; \
             ;; \
     esac; \
+    \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version;
diff --git a/nightly/bookworm/Dockerfile b/nightly/bookworm/Dockerfile
index c4d66c3..c212eaa 100644
--- a/nightly/bookworm/Dockerfile
+++ b/nightly/bookworm/Dockerfile
@@ -8,6 +8,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=nightly
 
 RUN set -eux; \
+    \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
         'amd64') \
@@ -39,13 +40,16 @@ RUN set -eux; \
             exit 1; \
             ;; \
     esac; \
+    \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version;
diff --git a/nightly/bookworm/slim/Dockerfile b/nightly/bookworm/slim/Dockerfile
index a5148fc..0f11f09 100644
--- a/nightly/bookworm/slim/Dockerfile
+++ b/nightly/bookworm/slim/Dockerfile
@@ -8,6 +8,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=nightly
 
 RUN set -eux; \
+    \
     apt-get update; \
     apt-get install -y --no-install-recommends \
         ca-certificates \
@@ -15,6 +16,7 @@ RUN set -eux; \
         libc6-dev \
         wget \
         ; \
+    \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
         'amd64') \
@@ -46,16 +48,20 @@ RUN set -eux; \
             exit 1; \
             ;; \
     esac; \
+    \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version; \
+    \
     apt-get remove -y --auto-remove \
         wget \
         ; \
diff --git a/nightly/bullseye/Dockerfile b/nightly/bullseye/Dockerfile
index 697f31e..e542afb 100644
--- a/nightly/bullseye/Dockerfile
+++ b/nightly/bullseye/Dockerfile
@@ -8,6 +8,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=nightly
 
 RUN set -eux; \
+    \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
         'amd64') \
@@ -31,13 +32,16 @@ RUN set -eux; \
             exit 1; \
             ;; \
     esac; \
+    \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version;
diff --git a/nightly/bullseye/slim/Dockerfile b/nightly/bullseye/slim/Dockerfile
index 6ecdd45..8fe926b 100644
--- a/nightly/bullseye/slim/Dockerfile
+++ b/nightly/bullseye/slim/Dockerfile
@@ -8,6 +8,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=nightly
 
 RUN set -eux; \
+    \
     apt-get update; \
     apt-get install -y --no-install-recommends \
         ca-certificates \
@@ -15,6 +16,7 @@ RUN set -eux; \
         libc6-dev \
         wget \
         ; \
+    \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
         'amd64') \
@@ -38,16 +40,20 @@ RUN set -eux; \
             exit 1; \
             ;; \
     esac; \
+    \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version; \
+    \
     apt-get remove -y --auto-remove \
         wget \
         ; \
diff --git a/nightly/trixie/Dockerfile b/nightly/trixie/Dockerfile
index f93228e..b0651c7 100644
--- a/nightly/trixie/Dockerfile
+++ b/nightly/trixie/Dockerfile
@@ -8,6 +8,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=nightly
 
 RUN set -eux; \
+    \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
         'amd64') \
@@ -43,13 +44,16 @@ RUN set -eux; \
             exit 1; \
             ;; \
     esac; \
+    \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version;
diff --git a/nightly/trixie/slim/Dockerfile b/nightly/trixie/slim/Dockerfile
index 02ac427..45e0e2f 100644
--- a/nightly/trixie/slim/Dockerfile
+++ b/nightly/trixie/slim/Dockerfile
@@ -8,6 +8,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=nightly
 
 RUN set -eux; \
+    \
     apt-get update; \
     apt-get install -y --no-install-recommends \
         ca-certificates \
@@ -15,6 +16,7 @@ RUN set -eux; \
         libc6-dev \
         wget \
         ; \
+    \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
         'amd64') \
@@ -50,16 +52,20 @@ RUN set -eux; \
             exit 1; \
             ;; \
     esac; \
+    \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version; \
+    \
     apt-get remove -y --auto-remove \
         wget \
         ; \
diff --git a/stable/alpine3.20/Dockerfile b/stable/alpine3.20/Dockerfile
index 4376354..029bd61 100644
--- a/stable/alpine3.20/Dockerfile
+++ b/stable/alpine3.20/Dockerfile
@@ -12,6 +12,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=1.90.0
 
 RUN set -eux; \
+    \
     arch="$(apk --print-arch)"; \
     case "$arch" in \
         'x86_64') \
@@ -31,13 +32,16 @@ RUN set -eux; \
             exit 1; \
             ;; \
     esac; \
+    \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version;
diff --git a/stable/alpine3.21/Dockerfile b/stable/alpine3.21/Dockerfile
index 51b9f30..2092d64 100644
--- a/stable/alpine3.21/Dockerfile
+++ b/stable/alpine3.21/Dockerfile
@@ -12,6 +12,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=1.90.0
 
 RUN set -eux; \
+    \
     arch="$(apk --print-arch)"; \
     case "$arch" in \
         'x86_64') \
@@ -31,13 +32,16 @@ RUN set -eux; \
             exit 1; \
             ;; \
     esac; \
+    \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version;
diff --git a/stable/alpine3.22/Dockerfile b/stable/alpine3.22/Dockerfile
index 94c7d52..037ebda 100644
--- a/stable/alpine3.22/Dockerfile
+++ b/stable/alpine3.22/Dockerfile
@@ -12,6 +12,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=1.90.0
 
 RUN set -eux; \
+    \
     arch="$(apk --print-arch)"; \
     case "$arch" in \
         'x86_64') \
@@ -31,13 +32,16 @@ RUN set -eux; \
             exit 1; \
             ;; \
     esac; \
+    \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version;
diff --git a/stable/bookworm/Dockerfile b/stable/bookworm/Dockerfile
index 065c556..5cd24a4 100644
--- a/stable/bookworm/Dockerfile
+++ b/stable/bookworm/Dockerfile
@@ -8,6 +8,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=1.90.0
 
 RUN set -eux; \
+    \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
         'amd64') \
@@ -39,13 +40,16 @@ RUN set -eux; \
             exit 1; \
             ;; \
     esac; \
+    \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version;
diff --git a/stable/bookworm/slim/Dockerfile b/stable/bookworm/slim/Dockerfile
index 742fe02..7a3e03f 100644
--- a/stable/bookworm/slim/Dockerfile
+++ b/stable/bookworm/slim/Dockerfile
@@ -8,6 +8,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=1.90.0
 
 RUN set -eux; \
+    \
     apt-get update; \
     apt-get install -y --no-install-recommends \
         ca-certificates \
@@ -15,6 +16,7 @@ RUN set -eux; \
         libc6-dev \
         wget \
         ; \
+    \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
         'amd64') \
@@ -46,16 +48,20 @@ RUN set -eux; \
             exit 1; \
             ;; \
     esac; \
+    \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version; \
+    \
     apt-get remove -y --auto-remove \
         wget \
         ; \
diff --git a/stable/bullseye/Dockerfile b/stable/bullseye/Dockerfile
index e00a382..7e77788 100644
--- a/stable/bullseye/Dockerfile
+++ b/stable/bullseye/Dockerfile
@@ -8,6 +8,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=1.90.0
 
 RUN set -eux; \
+    \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
         'amd64') \
@@ -31,13 +32,16 @@ RUN set -eux; \
             exit 1; \
             ;; \
     esac; \
+    \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version;
diff --git a/stable/bullseye/slim/Dockerfile b/stable/bullseye/slim/Dockerfile
index 500f5f7..63b82a8 100644
--- a/stable/bullseye/slim/Dockerfile
+++ b/stable/bullseye/slim/Dockerfile
@@ -8,6 +8,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=1.90.0
 
 RUN set -eux; \
+    \
     apt-get update; \
     apt-get install -y --no-install-recommends \
         ca-certificates \
@@ -15,6 +16,7 @@ RUN set -eux; \
         libc6-dev \
         wget \
         ; \
+    \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
         'amd64') \
@@ -38,16 +40,20 @@ RUN set -eux; \
             exit 1; \
             ;; \
     esac; \
+    \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version; \
+    \
     apt-get remove -y --auto-remove \
         wget \
         ; \
diff --git a/stable/trixie/Dockerfile b/stable/trixie/Dockerfile
index 57484e0..89ade1c 100644
--- a/stable/trixie/Dockerfile
+++ b/stable/trixie/Dockerfile
@@ -8,6 +8,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=1.90.0
 
 RUN set -eux; \
+    \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
         'amd64') \
@@ -43,13 +44,16 @@ RUN set -eux; \
             exit 1; \
             ;; \
     esac; \
+    \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version;
diff --git a/stable/trixie/slim/Dockerfile b/stable/trixie/slim/Dockerfile
index 743fdf8..c7e1ce9 100644
--- a/stable/trixie/slim/Dockerfile
+++ b/stable/trixie/slim/Dockerfile
@@ -8,6 +8,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     RUST_VERSION=1.90.0
 
 RUN set -eux; \
+    \
     apt-get update; \
     apt-get install -y --no-install-recommends \
         ca-certificates \
@@ -15,6 +16,7 @@ RUN set -eux; \
         libc6-dev \
         wget \
         ; \
+    \
     arch="$(dpkg --print-architecture)"; \
     case "$arch" in \
         'amd64') \
@@ -50,16 +52,20 @@ RUN set -eux; \
             exit 1; \
             ;; \
     esac; \
+    \
     url="https://static.rust-lang.org/rustup/archive/1.28.2/${rustArch}/rustup-init"; \
     wget --progress=dot:giga "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    \
     rustup --version; \
     cargo --version; \
     rustc --version; \
+    \
     apt-get remove -y --auto-remove \
         wget \
         ; \

From 7791344c8e45f16e0ff4b4275cadb4e87baa7f89 Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Thu, 2 Oct 2025 17:40:19 -0600
Subject: [PATCH 12/12] refactor: Always run versions last

---
 Dockerfile-slim.template         | 10 +++++-----
 nightly/bookworm/slim/Dockerfile | 10 +++++-----
 nightly/bullseye/slim/Dockerfile | 10 +++++-----
 nightly/trixie/slim/Dockerfile   | 10 +++++-----
 stable/bookworm/slim/Dockerfile  | 10 +++++-----
 stable/bullseye/slim/Dockerfile  | 10 +++++-----
 stable/trixie/slim/Dockerfile    | 10 +++++-----
 7 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template
index cc02a04..0cc8c8b 100644
--- a/Dockerfile-slim.template
+++ b/Dockerfile-slim.template
@@ -28,11 +28,11 @@ RUN set -eux; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
     \
-    rustup --version; \
-    cargo --version; \
-    rustc --version; \
-    \
     apt-get remove -y --auto-remove \
         wget \
         ; \
-    rm -rf /var/lib/apt/lists/*;
+    rm -rf /var/lib/apt/lists/*; \
+    \
+    rustup --version; \
+    cargo --version; \
+    rustc --version;
diff --git a/nightly/bookworm/slim/Dockerfile b/nightly/bookworm/slim/Dockerfile
index 0f11f09..3f2f1cd 100644
--- a/nightly/bookworm/slim/Dockerfile
+++ b/nightly/bookworm/slim/Dockerfile
@@ -58,11 +58,11 @@ RUN set -eux; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
     \
-    rustup --version; \
-    cargo --version; \
-    rustc --version; \
-    \
     apt-get remove -y --auto-remove \
         wget \
         ; \
-    rm -rf /var/lib/apt/lists/*;
+    rm -rf /var/lib/apt/lists/*; \
+    \
+    rustup --version; \
+    cargo --version; \
+    rustc --version;
diff --git a/nightly/bullseye/slim/Dockerfile b/nightly/bullseye/slim/Dockerfile
index 8fe926b..bef96b9 100644
--- a/nightly/bullseye/slim/Dockerfile
+++ b/nightly/bullseye/slim/Dockerfile
@@ -50,11 +50,11 @@ RUN set -eux; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
     \
-    rustup --version; \
-    cargo --version; \
-    rustc --version; \
-    \
     apt-get remove -y --auto-remove \
         wget \
         ; \
-    rm -rf /var/lib/apt/lists/*;
+    rm -rf /var/lib/apt/lists/*; \
+    \
+    rustup --version; \
+    cargo --version; \
+    rustc --version;
diff --git a/nightly/trixie/slim/Dockerfile b/nightly/trixie/slim/Dockerfile
index 45e0e2f..61c0989 100644
--- a/nightly/trixie/slim/Dockerfile
+++ b/nightly/trixie/slim/Dockerfile
@@ -62,11 +62,11 @@ RUN set -eux; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
     \
-    rustup --version; \
-    cargo --version; \
-    rustc --version; \
-    \
     apt-get remove -y --auto-remove \
         wget \
         ; \
-    rm -rf /var/lib/apt/lists/*;
+    rm -rf /var/lib/apt/lists/*; \
+    \
+    rustup --version; \
+    cargo --version; \
+    rustc --version;
diff --git a/stable/bookworm/slim/Dockerfile b/stable/bookworm/slim/Dockerfile
index 7a3e03f..e8a4cbe 100644
--- a/stable/bookworm/slim/Dockerfile
+++ b/stable/bookworm/slim/Dockerfile
@@ -58,11 +58,11 @@ RUN set -eux; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
     \
-    rustup --version; \
-    cargo --version; \
-    rustc --version; \
-    \
     apt-get remove -y --auto-remove \
         wget \
         ; \
-    rm -rf /var/lib/apt/lists/*;
+    rm -rf /var/lib/apt/lists/*; \
+    \
+    rustup --version; \
+    cargo --version; \
+    rustc --version;
diff --git a/stable/bullseye/slim/Dockerfile b/stable/bullseye/slim/Dockerfile
index 63b82a8..8aaafe0 100644
--- a/stable/bullseye/slim/Dockerfile
+++ b/stable/bullseye/slim/Dockerfile
@@ -50,11 +50,11 @@ RUN set -eux; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
     \
-    rustup --version; \
-    cargo --version; \
-    rustc --version; \
-    \
     apt-get remove -y --auto-remove \
         wget \
         ; \
-    rm -rf /var/lib/apt/lists/*;
+    rm -rf /var/lib/apt/lists/*; \
+    \
+    rustup --version; \
+    cargo --version; \
+    rustc --version;
diff --git a/stable/trixie/slim/Dockerfile b/stable/trixie/slim/Dockerfile
index c7e1ce9..f327795 100644
--- a/stable/trixie/slim/Dockerfile
+++ b/stable/trixie/slim/Dockerfile
@@ -62,11 +62,11 @@ RUN set -eux; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
     \
-    rustup --version; \
-    cargo --version; \
-    rustc --version; \
-    \
     apt-get remove -y --auto-remove \
         wget \
         ; \
-    rm -rf /var/lib/apt/lists/*;
+    rm -rf /var/lib/apt/lists/*; \
+    \
+    rustup --version; \
+    cargo --version; \
+    rustc --version;