Improve platform inference in shell initialisation.

Author: marc0der

src/main/bash/sdkman-init.sh

@@ -30,24 +30,67 @@ if [ -z "$SDKMAN_DIR" ]; then
 fi
 
 # infer platform
-SDKMAN_PLATFORM="$(uname)"
-if [[ "$SDKMAN_PLATFORM" == 'Linux' ]]; then
-	if [[ "$(uname -m)" == 'i686' ]]; then
-		SDKMAN_PLATFORM+='32'
-	elif [[ "$(uname -m)" == 'aarch64' ]]; then
-		SDKMAN_PLATFORM+='ARM64'
-	else
-		SDKMAN_PLATFORM+='64'
-	fi
-fi
+
+function infer_platform() {
+	local kernel
+	local machine
+	
+	kernel="$(uname -s)"
+	machine="$(uname -m)"
+	
+	case $kernel in
+	Linux)
+	  case $machine in
+	  i686)
+		echo "LinuxX32"
+		;;
+	  X86_64)
+		echo "LinuxX64"
+		;;
+	  armv7l)
+		echo "LinuxARM32"
+		;;
+	  armv8l)
+		echo "LinuxARM64"
+		;;
+	  aarch64)
+		echo "LinuxARM64"
+		;;
+	  *)
+	  	echo "LinuxX64"
+	  	;;
+	  esac
+	  ;;
+	Darwin)
+	  case $machine in
+	  X86_64)
+		echo "DarwinX64"
+		;;
+	  arm64)    
+		echo "DarwinARM64"
+		;;
+	  *)
+	  	echo "DarwinX64"
+	  	;;
+	  esac
+	  ;;
+	*)
+	  echo "$kernel"
+	esac
+}
+
+SDKMAN_PLATFORM="$(infer_platform)"
 export SDKMAN_PLATFORM
 
+__sdkman_echo_debug "Inferred platform: $SDKMAN_PLATFORM"
+
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 darwin=false
 solaris=false
 freebsd=false
-case "${SDKMAN_PLATFORM}" in
+SDKMAN_KERNEL="$(uname -s)"
+case "${SDKMAN_KERNEL}" in
 	CYGWIN*)
 		cygwin=true
 		;;

src/test/groovy/sdkman/env/SdkmanBashEnvBuilder.groovy

@@ -2,6 +2,7 @@ package sdkman.env
 
 import groovy.transform.ToString
 import sdkman.stubs.CurlStub
+import sdkman.stubs.UnameStub
 
 @ToString(includeNames = true)
 class SdkmanBashEnvBuilder {
@@ -13,6 +14,7 @@ class SdkmanBashEnvBuilder {
 
 	//optional fields with sensible defaults
 	private Optional<CurlStub> curlStub = Optional.empty()
+	private Optional<UnameStub> unameStub = Optional.empty()
 	private List candidates = ['groovy', 'grails', 'java']
 	private boolean offlineMode = false
 	private String broadcast = "This is a LIVE broadcast!"
@@ -43,6 +45,11 @@ class SdkmanBashEnvBuilder {
 		this
 	}
 
+	SdkmanBashEnvBuilder withUnameStub(UnameStub unameStub) {
+		this.unameStub = Optional.of(unameStub)
+		this
+	}
+
 	SdkmanBashEnvBuilder withCandidates(List candidates) {
 		this.candidates = candidates
 		this
@@ -104,7 +111,8 @@ class SdkmanBashEnvBuilder {
 		sdkmanTmpDir = prepareDirectory(sdkmanDir, "tmp")
 		sdkmanCandidatesDir = prepareDirectory(sdkmanDir, "candidates")
 
-		curlStub.map { cs -> cs.build() }
+		curlStub.map { it.build() }
+		unameStub.map { it.build() }
 
 		initializeCandidates(sdkmanCandidatesDir, candidates)
 		initializeCandidatesCache(sdkmanVarDir, candidates)

src/test/groovy/sdkman/specs/PlatformSpec.groovy

@@ -0,0 +1,35 @@
+package sdkman.specs
+
+import sdkman.support.SdkmanEnvSpecification
+
+class PlatformSpec extends SdkmanEnvSpecification {
+	def setup() {
+		sdkmanBashEnvBuilder.withCandidates(["groovy"])
+	}
+	
+	def "should set platform based on uname"() {
+		given:
+		unameStub.forKernel(kernel).forMachine(machine)
+		bash = sdkmanBashEnvBuilder.withUnameStub(unameStub).build()
+		bash.start()
+		bash.execute("source $bootstrapScript")
+		bash.execute('echo $SDKMAN_PLATFORM')
+		
+		expect:
+		bash.output.contains(platform)
+		
+		where:
+		kernel 		| machine	| platform
+		"Linux"		| "i686"	| "LinuxX32"
+		"Linux" 	| "X86_64"	| "LinuxX64"
+		"Linux"		| "armv7l"	| "LinuxARM32"
+		"Linux"		| "armv8l"	| "LinuxARM64"
+		"Linux"		| "aarch64"	| "LinuxARM64"
+		"Linux"     | ""	    | "LinuxX64"
+		"Darwin"	| "X86_64"	| "DarwinX64"
+		"Darwin"	| "arm64"	| "DarwinARM64"
+		"Darwin"    | ""        | "DarwinX64"
+		"MSYS64"	| "i686"	| "MSYS64"
+		"MSYS64"    | ""  		| "MSYS64"
+	}
+}

src/test/groovy/sdkman/steps/initialisation_steps.groovy

@@ -78,10 +78,11 @@ And(~'^offline mode is enabled with unreachable internet$') { ->
 	javaHome = FAKE_JDK_PATH
 }
 
-And(~'^a machine with "(.*)" installed$') { String platform ->
+And(~'^an "(.*)" machine with "(.*)" installed$') { String machine, String kernel ->
 	def binFolder = "$sdkmanBaseDir/bin" as File
 	UnameStub.prepareIn(binFolder)
-			.forPlatform(asSdkmanPlatform(platform))
+			.forKernel(kernel)
+			.forMachine(machine)
 			.build()
 }
 

src/test/groovy/sdkman/stubs/UnameStub.groovy

@@ -3,7 +3,9 @@ package sdkman.stubs
 class UnameStub {
 
 	private File file
-	private uname
+	private platform = "Linux"
+	private kernel = "Linux"
+	private machine = "X86_64"
 
 	static UnameStub prepareIn(File folder) {
 		folder.mkdirs()
@@ -16,12 +18,30 @@ class UnameStub {
 		new UnameStub(file: file)
 	}
 
+	UnameStub forKernel(String kernel) {
+		this.kernel = kernel
+		this
+	}
+	
+	UnameStub forMachine(String machine) {
+		this.machine = machine
+		this
+	}
+	
 	UnameStub forPlatform(String uname) {
-		this.uname = uname
+		this.platform = uname
 		this
 	}
 
 	void build() {
-		file << "echo $uname"
+		file << """
+			|if [[ "\$1" == '-m' ]]; then
+			|	echo "$machine"
+			|elif [[ "\$1" == '-s' ]]; then
+			|	echo "$kernel"
+			|else
+			|	echo "$platform"
+			|fi
+			""".stripMargin('|')
 	}
 }

src/test/groovy/sdkman/support/SdkmanEnvSpecification.groovy

@@ -2,6 +2,7 @@ package sdkman.support
 
 import sdkman.env.SdkmanBashEnvBuilder
 import sdkman.stubs.CurlStub
+import sdkman.stubs.UnameStub
 
 import static sdkman.support.FilesystemUtils.prepareBaseDir
 
@@ -10,6 +11,7 @@ abstract class SdkmanEnvSpecification extends BashEnvSpecification {
 	SdkmanBashEnvBuilder sdkmanBashEnvBuilder
 
 	CurlStub curlStub
+	UnameStub unameStub
 
 	File sdkmanBaseDirectory
 	File sdkmanDotDirectory
@@ -20,6 +22,7 @@ abstract class SdkmanEnvSpecification extends BashEnvSpecification {
 	def setup() {
 		sdkmanBaseDirectory = prepareBaseDir()
 		curlStub = CurlStub.prepareIn(new File(sdkmanBaseDirectory, "bin"))
+		unameStub = UnameStub.prepareIn(new File(sdkmanBaseDirectory, "bin"))
 		sdkmanBashEnvBuilder = SdkmanBashEnvBuilder
 				.create(sdkmanBaseDirectory)
 				.withCurlStub(curlStub)

src/test/groovy/sdkman/support/UnixUtils.groovy

@@ -2,37 +2,27 @@ package sdkman.support
 
 class UnixUtils {
 
+	private static platforms = [
+	        "Linux": [
+					"amd64": "LinuxX64"
+	        ],
+			"Darwin": [
+			        "X86_64": "DarwinX64",
+			],
+			"FreeBSD": [
+			        "amd64": "FreeBSD_X64"
+			]
+	]
+
 	static getPlatform() {
-		asSdkmanPlatform(System.getProperty("os.name"), System.getProperty("os.arch"))
+		def sdkmanPlatform = asSdkmanPlatform(System.getProperty("os.name"), System.getProperty("os.arch"))
+		println("Setting platform for test: $sdkmanPlatform")
+		sdkmanPlatform
 	}
-
-	static asSdkmanPlatform(platform, architecture = "") {
-
-		def platformArch = architecture == "aarch64" ? "$platform $architecture" : platform
-
-		def result
-		switch (platformArch) {
-			case "Mac OS X":
-				result = "Darwin"
-				break
-			case "Linux":
-				result = "Linux64"
-				break
-			case "Linux 64":
-				result = "Linux64"
-				break
-			case "Linux 32":
-				result = "Linux32"
-				break
-			case "Linux aarch64":
-				result = "LinuxARM64"
-				break
-			case "FreeBSD":
-				result = "FreeBSD"
-				break
-			default:
-				result = platform
-		}
-		result
+	
+	static asSdkmanPlatform(
+			platform = System.getProperty("os.name"),
+			architecture = System.getProperty("os.arch")) {
+		platforms[platform][architecture] ?: platform
 	}
 }