Read platform file from var folder.

sdkman · May 14, 2023 · f284bc4 · f284bc4
1 parent a5f07d6
commit f284bc4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/bash/sdkman-init.sh b/src/main/bash/sdkman-init.sh
@@ -31,7 +31,7 @@ if [ -f "${SDKMAN_DIR}/etc/config" ]; then
 fi
 
 # Read the platform file
-SDKMAN_PLATFORM="$(cat "${SDKMAN_DIR}/etc/platform")"
+SDKMAN_PLATFORM="$(cat "${SDKMAN_DIR}/var/platform")"
 export SDKMAN_PLATFORM
 
 # OS specific support (must be 'true' or 'false').

diff --git a/src/test/groovy/sdkman/env/SdkmanBashEnvBuilder.groovy b/src/test/groovy/sdkman/env/SdkmanBashEnvBuilder.groovy
@@ -121,10 +121,10 @@ class SdkmanBashEnvBuilder {
  curlStub.map { it.build() }
  unameStub.map { it.build() }
 
+ initializeConfiguration(sdkmanEtcDir, config)
  initializeCandidates(sdkmanCandidatesDir, candidates)
  initializeCandidatesCache(sdkmanVarDir, candidates)
- initializePlatformDescriptor(sdkmanEtcDir, platform)
- initializeConfiguration(sdkmanEtcDir, config)
+ initializePlatformDescriptor(sdkmanVarDir, platform)
  initializeScriptVersionFile(sdkmanVarDir, scriptVersion)
  initializeNativeVersionFile(sdkmanVarDir, nativeVersion)