equal
deleted
inserted
replaced
48 import scala.collection.JavaConversions._ |
48 import scala.collection.JavaConversions._ |
49 |
49 |
50 val standard_system = new Standard_System |
50 val standard_system = new Standard_System |
51 val settings = |
51 val settings = |
52 { |
52 { |
53 val env = Map(System.getenv.toList: _*) + |
53 val env0 = Map(System.getenv.toList: _*) + |
54 ("ISABELLE_JDK_HOME" -> standard_system.this_jdk_home()) |
54 ("ISABELLE_JDK_HOME" -> standard_system.this_jdk_home()) |
|
55 |
|
56 val user_home = System.getProperty("user.home") |
|
57 val env = |
|
58 if (user_home == null || env0.isDefinedAt("HOME")) env0 |
|
59 else env0 + ("HOME" -> user_home) |
55 |
60 |
56 val isabelle_home = |
61 val isabelle_home = |
57 if (this_isabelle_home != null) this_isabelle_home |
62 if (this_isabelle_home != null) this_isabelle_home |
58 else |
63 else |
59 env.get("ISABELLE_HOME") match { |
64 env.get("ISABELLE_HOME") match { |