diff --git a/src/main/bash/sdkman-init.sh b/src/main/bash/sdkman-init.sh index 5d7c72e6..7e8e3434 100644 --- 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 index 151c9b37..05d600f1 100644 --- 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)