From f284bc4097a64fa430f578ef4eb03e4e1b51a695 Mon Sep 17 00:00:00 2001
From: Marco Vermeulen <vermeulen.mp@gmail.com>
Date: Sun, 14 May 2023 21:49:51 +0100
Subject: [PATCH] Read platform file from var folder.

---
 src/main/bash/sdkman-init.sh                           | 2 +-
 src/test/groovy/sdkman/env/SdkmanBashEnvBuilder.groovy | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/bash/sdkman-init.sh b/src/main/bash/sdkman-init.sh
index 5d7c72e66..7e8e34349 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 151c9b379..05d600f15 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)