Read platform from descriptor file.

sdkman · May 14, 2023 · 33a4adf · 33a4adf
1 parent c05c7e4
commit 33a4adf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 62 deletions.
diff --git a/src/main/bash/sdkman-env-helpers.sh b/src/main/bash/sdkman-env-helpers.sh
@@ -64,7 +64,7 @@ function __sdkman_determine_version() {
 			version=$(__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/candidates/default/${candidate}")
 		fi
 
-		local validation_url="${SDKMAN_CANDIDATES_API}/candidates/validate/${candidate}/${version}/$(echo $SDKMAN_PLATFORM | tr '[:upper:]' '[:lower:]')"
+		local validation_url="${SDKMAN_CANDIDATES_API}/candidates/validate/${candidate}/${version}/${SDKMAN_PLATFORM}"
 		VERSION_VALID=$(__sdkman_secure_curl "$validation_url")
 		__sdkman_echo_debug "Validate $candidate $version for $SDKMAN_PLATFORM: $VERSION_VALID"
 		__sdkman_echo_debug "Validation URL: $validation_url"

diff --git a/src/main/bash/sdkman-init.sh b/src/main/bash/sdkman-init.sh
@@ -30,66 +30,8 @@ if [ -f "${SDKMAN_DIR}/etc/config" ]; then
 	source "${SDKMAN_DIR}/etc/config"
 fi
 
-# infer platform
-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"
-		;;
-	  armv6l)
-		echo "LinuxARM32HF"
-		;;
-	  armv7l)
-		echo "LinuxARM32HF"
-		;;
-	  armv8l)
-		echo "LinuxARM32HF"
-		;;
-	  aarch64)
-		echo "LinuxARM64"
-		;;
-	  *)
-	  	echo "Exotic"
-	  	;;
-	  esac
-	  ;;
-	Darwin)
-	  case $machine in
-	  x86_64)
-		echo "DarwinX64"
-		;;
-	  arm64)
-		if [[ "$sdkman_rosetta2_compatible" == 'true' ]]; then
-			echo "DarwinX64"
-		else
-			echo "DarwinARM64"
-		fi
-		;;
-	  *)
-	  	echo "DarwinX64"
-	  	;;
-	  esac
-	  ;;
-	MSYS*|MINGW*)
-	  echo "$kernel"
-	  ;;
-	*)
-		echo "Exotic"
-	esac
-}
-
-SDKMAN_PLATFORM="$(infer_platform | tr '[:upper:]' '[:lower:]')"
+# Read the platform file
+SDKMAN_PLATFORM="$(cat "${SDKMAN_DIR}/etc/platform")"
 export SDKMAN_PLATFORM
 
 # OS specific support (must be 'true' or 'false').

diff --git a/src/main/bash/sdkman-install.sh b/src/main/bash/sdkman-install.sh
@@ -122,7 +122,7 @@ function __sdkman_download() {
 	metadata_folder="${SDKMAN_DIR}/var/metadata"
 	mkdir -p ${metadata_folder}
 
-	local platform_parameter="$(echo $SDKMAN_PLATFORM | tr '[:upper:]' '[:lower:]')"
+	local platform_parameter="$SDKMAN_PLATFORM"
 	local download_url="${SDKMAN_CANDIDATES_API}/broker/download/${candidate}/${version}/${platform_parameter}"
 	local base_name="${candidate}-${version}"
 	local tmp_headers_file="${SDKMAN_DIR}/tmp/${base_name}.headers.tmp"