From 3d7921a6ee3ca22a541503cd511ef2e158d050e6 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Mon, 7 Aug 2023 20:58:56 -0400
Subject: [PATCH] fix up ARCH setting

---
 .../s6-rc.d/init-mod-universal-docker-in-docker-add-package/run | 2 +-
 .../s6-rc.d/init-mod-universal-docker-in-docker-qemu/run        | 2 +-
 .../s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/run   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/run
index 9776bf7..74541ff 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/run
@@ -1,5 +1,6 @@
 #!/usr/bin/with-contenv bash
 
+ARCH=$(uname -m)
 if [[ "${ARCH}" = "armv7l" ]]; then
   echo "**** The universal docker mod no longer supports arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****"
   exit 0
@@ -37,7 +38,6 @@ else
         xfsprogs \
         xz" >> /mod-repo-packages-to-install.list
 fi
-ARCH=$(uname -m)
 if [ -d "/docker-tgz" ] ; then
     echo "Copying over docker and docker-compose binaries"
     mkdir -p /usr/local/lib/docker/cli-plugins
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-qemu/run b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-qemu/run
index d95d700..cb7e5a5 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-qemu/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-qemu/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-if [[ "${ARCH}" = "armv7l" ]]; then
+if [[ $(uname -m) = "armv7l" ]]; then
   echo "**** The universal docker mod no longer supports arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****"
   exit 0
 fi
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/run b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/run
index 1c6abf4..a4d16f0 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-if [[ "${ARCH}" = "armv7l" ]]; then
+if [[ $(uname -m) = "armv7l" ]]; then
   echo "**** The universal docker mod no longer supports arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****"
   sleep infinity
 fi