erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Make sure JAVA_HOME points to the JDK and not the JRE.

Browse source 
Should fix https://github.com/cbeust/kobalt/issues/428.
This commit is contained in:
Cedric Beust 2017-04-24 09:48:23 -07:00
parent 0f658cf010
commit ec7d24a6f8
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/SystemProperties.kt
View file

@ -2,10 +2,16 @@ package com.beust.kobalt
class SystemProperties { class SystemProperties {
companion object { companion object {
val javaBase = val javaBase : String
System.getenv("JAVA_HOME") get() {
val jh = System.getenv("JAVA_HOME")
?: System.getProperty("java.home") ?: System.getProperty("java.home")
?: throw IllegalArgumentException("JAVA_HOME not defined") ?: throw IllegalArgumentException("JAVA_HOME not defined")
val result =
if (jh.toLowerCase().endsWith("jre")) jh.substring(0, jh.length - 4)
else jh
return result
}
val javaVersion = System.getProperty("java.version") val javaVersion = System.getProperty("java.version")
val homeDir = System.getProperty("user.home") val homeDir = System.getProperty("user.home")
val tmpDir = System.getProperty("java.io.tmpdir") val tmpDir = System.getProperty("java.io.tmpdir")