fix(adoptium): edge case when 32bit system on 64bit arm

Smarteon · Aug 14, 2024 · 42773f4 · 42773f4
1 parent a82e569
commit 42773f4
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/manifests/adoptium.pp b/manifests/adoptium.pp
@@ -96,15 +96,19 @@
     default => $facts['os']['architecture']
   }
 
-  case $os_architecture {
-    'i386' : { $arch = 'x86-32' }
-    'x86_64' : { $arch = 'x64' }
-    'amd64' : { $arch = 'x64' }
-    'aarch64' : { $arch = 'aarch64' }
-    'arm64' : { $arch = 'aarch64' }
-    'armv7l' : { $arch = 'arm' }
-    default : {
-      fail ("unsupported platform ${$os_architecture}")
+  if $facts['platform'] =~ /arm/ {
+  $arch = 'arm'
+  } else {
+    case $os_architecture {
+      'i386' : { $arch = 'x86-32' }
+      'x86_64' : { $arch = 'x64' }
+      'amd64' : { $arch = 'x64' }
+      'aarch64' : { $arch = 'aarch64' }
+      'arm64' : { $arch = 'aarch64' }
+      'armv7l' : { $arch = 'arm' }
+      default : {
+        fail("unsupported platform ${os_architecture}")
+      }
     }
   }