Merge branch 'bug/JAL-3523_cwd_not_preserved' into develop
authorJim Procter <j.procter@dundee.ac.uk>
Thu, 10 Feb 2022 15:45:23 +0000 (15:45 +0000)
committerJim Procter <j.procter@dundee.ac.uk>
Thu, 10 Feb 2022 15:45:23 +0000 (15:45 +0000)
rebuilt getdown jars - did not bump version

1  2 
getdown/lib/getdown-core.jar
getdown/lib/getdown-launcher-local.jar
getdown/lib/getdown-launcher.jar
getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
j11lib/getdown-core.jar
j8lib/getdown-core.jar

index 4edf9b0,f4fe95a..a11a269
Binary files differ
index 500b38b,634f35a..4ac9d5d
Binary files differ
index 2ead1c7,599237f..999c3fa
Binary files differ
@@@ -31,7 -31,7 +31,7 @@@ import java.util.zip.GZIPInputStream
  
  import jalview.bin.HiDPISetting;
  import jalview.bin.MemorySetting;
 -//import com.install4j.api.launcher.Variables;
 +import jalview.util.LaunchUtils;
  
  import com.threerings.getdown.util.*;
  // avoid ambiguity with java.util.Base64 which we can't use as it's 1.8+
@@@ -1181,17 -1181,6 +1181,17 @@@ public class Applicatio
              continue;
            }
          }
 +
 +        // use saved preferences if no cmdline args
 +        LaunchUtils.loadChannelProps(getAppDir());
 +        if (LaunchUtils.getBooleanUserPreference(MemorySetting.CUSTOMISED_SETTINGS)) {
 +          if (jvmmempc == null) {
 +            jvmmempc = LaunchUtils.getUserPreference(MemorySetting.MEMORY_JVMMEMPC);
 +          }
 +          if (jvmmemmax == null) {
 +            jvmmemmax = LaunchUtils.getUserPreference(MemorySetting.MEMORY_JVMMEMMAX);
 +          }
 +        }
          
          // add the memory setting from jvmmempc and jvmmemmax
          long maxMemLong = -1;
          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 --combined j11lib/getdown-core.jar
index 4edf9b0,f4fe95a..a11a269
Binary files differ
diff --combined j8lib/getdown-core.jar
index 4edf9b0,f4fe95a..a11a269
Binary files differ