From 5d2149fc7227c7316ea3df519890cc1364ac5e2e Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Mon, 29 Jul 2019 17:21:33 +0100 Subject: [PATCH 1/1] JAL-3384 Added -out option to specify stdout/stderr file. Can start with File.separator for absolute path, otherwise assumed to be file in getdownappdir --- src/jalview/bin/Jalview.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java index 45bb8d1..b259741 100755 --- a/src/jalview/bin/Jalview.java +++ b/src/jalview/bin/Jalview.java @@ -199,12 +199,26 @@ public class Jalview { System.setSecurityManager(null); + ArgsParser aparser = new ArgsParser(args); // set stdout and stderr to file if launched by getdown String appdirString = System.getProperty("getdownappdir"); if (appdirString != null) { - String logFilename = "output.log"; - File logFile = new File(appdirString, logFilename); + + String logFilename = aparser.getValue("out"); + String parent = appdirString; + if (logFilename == null) + { + logFilename = "output.log"; + } + else + { + if (logFilename.startsWith(File.separator)) + { + parent = null; + } + } + File logFile = new File(parent, logFilename); if (logFile.exists()) { logFile.delete(); @@ -237,7 +251,6 @@ public class Jalview // report Jalview version Cache.loadBuildProperties(true); - ArgsParser aparser = new ArgsParser(args); boolean headless = false; if (aparser.contains("help") || aparser.contains("h")) -- 1.7.10.2