prefer standard_path for bash arg;
authorwenzelm
Tue, 01 Nov 2016 19:43:13 +0100
changeset 64454 4c868fa9d79b
parent 64453 075c077a6e29
child 64455 2cb3e2c2ce8b
prefer standard_path for bash arg;
src/Pure/System/isabelle_system.scala
--- a/src/Pure/System/isabelle_system.scala	Tue Nov 01 15:12:45 2016 +0100
+++ b/src/Pure/System/isabelle_system.scala	Tue Nov 01 19:43:13 2016 +0100
@@ -107,12 +107,14 @@
         dump.deleteOnExit
         try {
           val cmd1 =
-            if (Platform.is_windows) List(cygwin_root1 + "\\bin\\bash", "-l") else Nil
-          val cmd2 =
-            List(isabelle_root1 + JFile.separator + "bin" + JFile.separator + "isabelle",
-              "getenv", "-d", dump.toString)
+            if (Platform.is_windows)
+              List(cygwin_root1 + "\\bin\\bash", "-l",
+                File.standard_path(isabelle_root1 + "\\bin\\isabelle"))
+            else
+              List(isabelle_root1 + "/bin/isabelle")
+          val cmd = cmd1 ::: List("getenv", "-d", dump.toString)
 
-          val (output, rc) = process_output(process(cmd1 ::: cmd2, env = env, redirect = true))
+          val (output, rc) = process_output(process(cmd, env = env, redirect = true))
           if (rc != 0) error(output)
 
           val entries =