equal
deleted
inserted
replaced
105 { |
105 { |
106 val dump = JFile.createTempFile("settings", null) |
106 val dump = JFile.createTempFile("settings", null) |
107 dump.deleteOnExit |
107 dump.deleteOnExit |
108 try { |
108 try { |
109 val cmd1 = |
109 val cmd1 = |
110 if (Platform.is_windows) List(cygwin_root1 + "\\bin\\bash", "-l") else Nil |
110 if (Platform.is_windows) |
111 val cmd2 = |
111 List(cygwin_root1 + "\\bin\\bash", "-l", |
112 List(isabelle_root1 + JFile.separator + "bin" + JFile.separator + "isabelle", |
112 File.standard_path(isabelle_root1 + "\\bin\\isabelle")) |
113 "getenv", "-d", dump.toString) |
113 else |
114 |
114 List(isabelle_root1 + "/bin/isabelle") |
115 val (output, rc) = process_output(process(cmd1 ::: cmd2, env = env, redirect = true)) |
115 val cmd = cmd1 ::: List("getenv", "-d", dump.toString) |
|
116 |
|
117 val (output, rc) = process_output(process(cmd, env = env, redirect = true)) |
116 if (rc != 0) error(output) |
118 if (rc != 0) error(output) |
117 |
119 |
118 val entries = |
120 val entries = |
119 (for (entry <- File.read(dump).split("\u0000") if entry != "") yield { |
121 (for (entry <- File.read(dump).split("\u0000") if entry != "") yield { |
120 val i = entry.indexOf('=') |
122 val i = entry.indexOf('=') |