From 45c1d9dfe1ecececf4b1e3fd9727da02e5e2d9ba Mon Sep 17 00:00:00 2001 From: Marco Vermeulen Date: Tue, 29 Dec 2020 23:04:09 +0000 Subject: [PATCH] Fix x86_64 machine name for Linux and Darwin. --- src/main/bash/sdkman-init.sh | 4 ++-- src/test/groovy/sdkman/specs/PlatformSpec.groovy | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/bash/sdkman-init.sh b/src/main/bash/sdkman-init.sh index 6154c018..a693925a 100644 --- a/src/main/bash/sdkman-init.sh +++ b/src/main/bash/sdkman-init.sh @@ -44,7 +44,7 @@ function infer_platform() { i686) echo "LinuxX32" ;; - X86_64) + x86_64) echo "LinuxX64" ;; armv7l) @@ -63,7 +63,7 @@ function infer_platform() { ;; Darwin) case $machine in - X86_64) + x86_64) echo "DarwinX64" ;; arm64) diff --git a/src/test/groovy/sdkman/specs/PlatformSpec.groovy b/src/test/groovy/sdkman/specs/PlatformSpec.groovy index 2c05e244..c6bc8b28 100644 --- a/src/test/groovy/sdkman/specs/PlatformSpec.groovy +++ b/src/test/groovy/sdkman/specs/PlatformSpec.groovy @@ -21,12 +21,12 @@ class PlatformSpec extends SdkmanEnvSpecification { where: kernel | machine | platform "Linux" | "i686" | "LinuxX32" - "Linux" | "X86_64" | "LinuxX64" + "Linux" | "x86_64" | "LinuxX64" "Linux" | "armv7l" | "LinuxARM32" "Linux" | "armv8l" | "LinuxARM64" "Linux" | "aarch64" | "LinuxARM64" "Linux" | "" | "LinuxX64" - "Darwin" | "X86_64" | "DarwinX64" + "Darwin" | "x86_64" | "DarwinX64" "Darwin" | "arm64" | "DarwinARM64" "Darwin" | "" | "DarwinX64" "MSYS64" | "i686" | "MSYS64"