--- a/src/Pure/System/isabelle_system.scala Sat Feb 13 23:59:35 2016 +0100
+++ b/src/Pure/System/isabelle_system.scala Sun Feb 14 11:52:27 2016 +0100
@@ -167,7 +167,7 @@
def mkdirs(path: Path): Unit =
if (!path.is_dir) {
- bash_result("perl -e \"use File::Path make_path; make_path(" + File.shell_path(path) + ");\"")
+ bash("perl -e \"use File::Path make_path; make_path(" + File.shell_path(path) + ");\"")
if (!path.is_dir) error("Failed to create directory: " + quote(File.platform_path(path)))
}
@@ -316,7 +316,7 @@
}
}
- def bash_result(script: String, cwd: JFile = null, env: Map[String, String] = null,
+ def bash(script: String, cwd: JFile = null, env: Map[String, String] = null,
progress_stdout: String => Unit = (_: String) => (),
progress_stderr: String => Unit = (_: String) => (),
progress_limit: Option[Long] = None,
@@ -342,14 +342,6 @@
}
}
- def bash(script: String): Int =
- {
- val result = bash_result(script)
- Output.warning(Library.trim_line(result.err))
- Output.writeln(Library.trim_line(result.out))
- result.rc
- }
-
/* system tools */
@@ -371,13 +363,13 @@
}
def open(arg: String): Unit =
- bash_result("exec \"$ISABELLE_OPEN\" '" + arg + "' >/dev/null 2>/dev/null &")
+ bash("exec \"$ISABELLE_OPEN\" '" + arg + "' >/dev/null 2>/dev/null &")
def pdf_viewer(arg: Path): Unit =
- bash_result("exec \"$PDF_VIEWER\" '" + File.standard_path(arg) + "' >/dev/null 2>/dev/null &")
+ bash("exec \"$PDF_VIEWER\" '" + File.standard_path(arg) + "' >/dev/null 2>/dev/null &")
def hg(cmd_line: String, cwd: Path = Path.current): Bash.Result =
- bash_result("cd " + File.shell_path(cwd) + " && \"${HG:-hg}\" " + cmd_line)
+ bash("cd " + File.shell_path(cwd) + " && \"${HG:-hg}\" " + cmd_line)
/** Isabelle resources **/