From: Jim Procter <j.procter@dundee.ac.uk>
Date: Thu, 10 Feb 2022 15:45:23 +0000 (+0000)
Subject: Merge branch 'bug/JAL-3523_cwd_not_preserved' into develop
X-Git-Tag: Release_2_11_2_0~13^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3d27869df8ea8726a5de9374cd83db1e85dfc13a;hp=1e591b1447109f90a7bb831b89b551243e61267c;p=jalview.git

Merge branch 'bug/JAL-3523_cwd_not_preserved' into develop
rebuilt getdown jars - did not bump version
---

diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar
index 4edf9b0..a11a269 100644
Binary files a/getdown/lib/getdown-core.jar and b/getdown/lib/getdown-core.jar differ
diff --git a/getdown/lib/getdown-launcher-local.jar b/getdown/lib/getdown-launcher-local.jar
index 500b38b..4ac9d5d 100644
Binary files a/getdown/lib/getdown-launcher-local.jar and b/getdown/lib/getdown-launcher-local.jar differ
diff --git a/getdown/lib/getdown-launcher.jar b/getdown/lib/getdown-launcher.jar
index 2ead1c7..999c3fa 100644
Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ
diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
index 684844a..9deb5bc 100644
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
@@ -1264,7 +1264,9 @@ public class Application
         String[] sargs = args.toArray(new String[args.size()]);
         log.info("Running " + StringUtil.join(sargs, "\n  "));
 
-        return Runtime.getRuntime().exec(sargs, envp, getAppDir());
+        // don't set the working dir, leave it the same as the working dir of the invocation
+        //return Runtime.getRuntime().exec(sargs, envp, getAppDir());
+        return Runtime.getRuntime().exec(sargs, envp);
     }
 
     /**
diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar
index 4edf9b0..a11a269 100644
Binary files a/j11lib/getdown-core.jar and b/j11lib/getdown-core.jar differ
diff --git a/j8lib/getdown-core.jar b/j8lib/getdown-core.jar
index 4edf9b0..a11a269 100644
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ