From f2539377e748ef6376ac0808339e02ba3bd41bac Mon Sep 17 00:00:00 2001
From: mikaello <2505178+mikaello@users.noreply.github.com>
Date: Sat, 16 May 2026 22:59:45 +0200
Subject: [PATCH 1/2] fix: drop unreachable amd64/arm64 arch values

`uname -m` on Linux returns `x86_64` or `aarch64`; `amd64` and `arm64`
are dpkg / macOS spellings that the kernel never produces, so those
branches were dead.
---
 src/kotlinc/install.sh            | 2 +-
 src/modern-shell-utils/install.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kotlinc/install.sh b/src/kotlinc/install.sh
index f22be03..9873ce5 100644
--- a/src/kotlinc/install.sh
+++ b/src/kotlinc/install.sh
@@ -62,7 +62,7 @@ export DEBIAN_FRONTEND=noninteractive
 
 echo "Step 4, check if architecture is supported"
 architecture="$(uname -m)"
-if [ "${architecture}" != "amd64" ] && [ "${architecture}" != "x86_64" ] && [ "${architecture}" != "arm64" ] && [ "${architecture}" != "aarch64" ]; then
+if [ "${architecture}" != "x86_64" ] && [ "${architecture}" != "aarch64" ]; then
     echo "(!) Architecture $architecture unsupported"
     exit 1
 fi
diff --git a/src/modern-shell-utils/install.sh b/src/modern-shell-utils/install.sh
index 50a12bb..3182d28 100644
--- a/src/modern-shell-utils/install.sh
+++ b/src/modern-shell-utils/install.sh
@@ -50,7 +50,7 @@ export DEBIAN_FRONTEND=noninteractive
 
 echo "Step 4, check if architecture is supported"
 architecture="$(uname -m)"
-if [ "${architecture}" != "amd64" ] && [ "${architecture}" != "x86_64" ] && [ "${architecture}" != "arm64" ] && [ "${architecture}" != "aarch64" ]; then
+if [ "${architecture}" != "x86_64" ] && [ "${architecture}" != "aarch64" ]; then
     echo "(!) Architecture $architecture unsupported"
     exit 1
 fi

From e42ce019ebd1e88e7e48c5d449b0a5058fba3cb0 Mon Sep 17 00:00:00 2001
From: mikaello <2505178+mikaello@users.noreply.github.com>
Date: Sat, 16 May 2026 23:00:04 +0200
Subject: [PATCH 2/2] refactor(modern-shell-utils): tidy install script

- Renumber "Step 4.5" / "Step 5" to "Step 5" / "Step 6" so the trace
  reads sequentially.
- Use `ln -sf` so re-running the script (e.g. after rebuild on top of
  an existing layer) replaces the symlinks instead of failing on "File
  exists".
---
 src/modern-shell-utils/install.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modern-shell-utils/install.sh b/src/modern-shell-utils/install.sh
index 3182d28..96fbe2c 100644
--- a/src/modern-shell-utils/install.sh
+++ b/src/modern-shell-utils/install.sh
@@ -56,7 +56,7 @@ if [ "${architecture}" != "x86_64" ] && [ "${architecture}" != "aarch64" ]; then
 fi
 
 
-echo "Step 4.5, add apt repo deb.gierens.de to get 'eza'. To be removed when 'eza' is available in mainstream repo"
+echo "Step 5, add apt repo deb.gierens.de to get 'eza'. To be removed when 'eza' is available in mainstream repo"
 check_packages ca-certificates gpg wget
 mkdir -p /etc/apt/keyrings
 wget -qO- https://raw.githubusercontent.com/eza-community/eza/main/deb.asc | gpg --dearmor -o /etc/apt/keyrings/gierens.gpg
@@ -65,11 +65,11 @@ chmod 644 /etc/apt/keyrings/gierens.gpg /etc/apt/sources.list.d/gierens.list
 apt-get update -y
 
 
-echo "Step 5, install packages"
+echo "Step 6, install packages"
 check_packages eza fd-find silversearcher-ag bat
 
-ln -s /usr/bin/fdfind /usr/local/bin/fd
-ln -s /usr/bin/batcat /usr/local/bin/bat
+ln -sf /usr/bin/fdfind /usr/local/bin/fd
+ln -sf /usr/bin/batcat /usr/local/bin/bat
 
 
 # Clean up