Skip to content

Commit 9b9ead1

Browse files
committed
Fixed paths.
Signed-off-by: Marcin Kuszczak <1508798+aartiPl@users.noreply.github.com>
1 parent 335bc69 commit 9b9ead1

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

src/main/kotlin/io/github/kscripting/kscript/model/ConfigBuilder.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,26 +46,26 @@ class ConfigBuilder(
4646
val selfName: String = selfName ?: environment.getEnvVariableOrNull("KSCRIPT_NAME") ?: "kscript"
4747

4848
val kscriptDir: OsPath? =
49-
kscriptDir ?: environment.getEnvVariableOrNull("KSCRIPT_DIRECTORY")?.toOsPathFromOsSpecific(osType)
49+
kscriptDir ?: environment.getEnvVariableOrNull("KSCRIPT_DIRECTORY")?.toOsPathFromNative()
5050

5151
val cacheDir: OsPath = cacheDir ?: kscriptDir?.resolve("cache") ?: when {
5252
osType.isWindowsLike() -> environment.getEnvVariableOrNull("LOCALAPPDATA")?.toOsPathFromNative() ?: tempDir
5353
osType == OsType.MACOS -> userHomeDir.resolve("Library", "Caches")
54-
else -> environment.getEnvVariableOrNull("XDG_CACHE_DIR")?.toOsPathFromOsSpecific(osType)
54+
else -> environment.getEnvVariableOrNull("XDG_CACHE_DIR")?.toOsPathFromNative()
5555
?: userHomeDir.resolve(".cache")
5656
}.resolve("kscript")
5757

5858
val kotlinHomeDir: OsPath =
59-
kotlinHomeDir ?: environment.getEnvVariableOrNull("KOTLIN_HOME")?.toOsPathFromOsSpecific(osType)
60-
?: ShellUtils.guessKotlinHome(osType)?.toOsPathFromOsSpecific(osType)
59+
kotlinHomeDir ?: environment.getEnvVariableOrNull("KOTLIN_HOME")?.toOsPathFromNative()
60+
?: ShellUtils.guessKotlinHome(osType)?.toOsPathFromNative()
6161
?: throw IllegalStateException("KOTLIN_HOME is not set and could not be inferred from context.")
6262

6363
val configFile: OsPath = configFile ?: kscriptDir?.resolve("kscript.properties") ?: when {
6464
osType.isWindowsLike() -> environment.getEnvVariableOrNull("LOCALAPPDATA")?.toOsPathFromNative()
6565
?: userHomeDir.resolve(".config")
6666

6767
osType == OsType.MACOS -> userHomeDir.resolve("Library", "Application Support")
68-
else -> environment.getEnvVariableOrNull("XDG_CONFIG_DIR")?.toOsPathFromOsSpecific(osType)
68+
else -> environment.getEnvVariableOrNull("XDG_CONFIG_DIR")?.toOsPathFromNative()
6969
?: userHomeDir.resolve(".config")
7070
}.resolve("kscript", "kscript.properties")
7171

@@ -110,7 +110,7 @@ class ConfigBuilder(
110110
?: configProperties.getPropertyOrNull("scripting.repository.password") ?: ""
111111

112112
val artifactsDir: OsPath? =
113-
artifactsDir ?: environment.getEnvVariableOrNull("KSCRIPT_DIRECTORY_ARTIFACTS")?.toOsPathFromOsSpecific(osType)
113+
artifactsDir ?: environment.getEnvVariableOrNull("KSCRIPT_DIRECTORY_ARTIFACTS")?.toOsPathFromNative()
114114
?: configProperties.getPropertyOrNull("scripting.directory.artifacts")?.toOsPathFromOsSpecific(osType)
115115

116116
val scriptingConfig = ScriptingConfig(

0 commit comments

Comments
 (0)