Fix: detect arch on Mac OS X

fioan89 · fioan89 · commit 299b260439e2 · 2022-06-16T23:31:25.000+03:00
- on Mac OS X running on Intel proc, the arch is not correctly detected. That is because the jdk implementation reports `x86_64` instead of `amd64` - also, https://www.mail-archive.com/dev@netbeans.apache.org/msg08753.html reports arch as `aarch64` on Mac OS running on M1 - resolves #9
diff --git a/src/main/kotlin/com/coder/gateway/sdk/os.kt b/src/main/kotlin/com/coder/gateway/sdk/os.kt
@@ -3,13 +3,13 @@ package com.coder.gateway.sdk
 fun getOS(): OS? {
     val os = System.getProperty("os.name").toLowerCase()
     return when {
-        os.contains("win") -> {
+        os.contains("win", true) -> {
             OS.WINDOWS
         }
-        os.contains("nix") || os.contains("nux") || os.contains("aix") -> {
+        os.contains("nix", true) || os.contains("nux", true) || os.contains("aix", true) -> {
             OS.LINUX
         }
-        os.contains("mac") -> {
+        os.contains("mac", true) -> {
             OS.MAC
         }
         else -> null
@@ -19,9 +19,9 @@ fun getOS(): OS? {
 fun getArch(): Arch? {
     val arch = System.getProperty("os.arch").toLowerCase()
     return when {
-        arch.contains("amd64") -> Arch.amd64
-        arch.contains("arm64") -> Arch.arm64
-        arch.contains("armv7") -> Arch.armv7
+        arch.contains("amd64", true) || arch.contains("x86_64", true) -> Arch.amd64
+        arch.contains("arm64", true) || arch.contains("aarch64", true) -> Arch.arm64
+        arch.contains("armv7", true) -> Arch.armv7
         else -> null
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,13 @@ package com.coder.gateway.sdk`
`3`	`3`	`fun getOS(): OS? {`
`4`	`4`	`val os = System.getProperty("os.name").toLowerCase()`
`5`	`5`	`return when {`
`6`		`- os.contains("win") -> {`
	`6`	`+ os.contains("win", true) -> {`
`7`	`7`	`OS.WINDOWS`
`8`	`8`	`}`
`9`		`- os.contains("nix") \|\| os.contains("nux") \|\| os.contains("aix") -> {`
	`9`	`+ os.contains("nix", true) \|\| os.contains("nux", true) \|\| os.contains("aix", true) -> {`
`10`	`10`	`OS.LINUX`
`11`	`11`	`}`
`12`		`- os.contains("mac") -> {`
	`12`	`+ os.contains("mac", true) -> {`
`13`	`13`	`OS.MAC`
`14`	`14`	`}`
`15`	`15`	`else -> null`
`@@ -19,9 +19,9 @@ fun getOS(): OS? {`
`19`	`19`	`fun getArch(): Arch? {`
`20`	`20`	`val arch = System.getProperty("os.arch").toLowerCase()`
`21`	`21`	`return when {`
`22`		`- arch.contains("amd64") -> Arch.amd64`
`23`		`- arch.contains("arm64") -> Arch.arm64`
`24`		`- arch.contains("armv7") -> Arch.armv7`
	`22`	`+ arch.contains("amd64", true) \|\| arch.contains("x86_64", true) -> Arch.amd64`
	`23`	`+ arch.contains("arm64", true) \|\| arch.contains("aarch64", true) -> Arch.arm64`
	`24`	`+ arch.contains("armv7", true) -> Arch.armv7`
`25`	`25`	`else -> null`
`26`	`26`	`}`
`27`	`27`	`}`