Merge pull request sbt#211 from eatkins/gc-output

Whitelist java9-rt-ext- output in rt export process
spangaer · Feb 13, 2018 · aa574a8 · aa574a8
2 parents 09cf5cb + 09a7152
commit aa574a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/java9-rt-export/src/main/java/io/github/retronym/java9rtexport/Export.java b/java9-rt-export/src/main/java/io/github/retronym/java9rtexport/Export.java
@@ -29,6 +29,10 @@ public static void main(String[] args) {
             if (destination.equals("--rt-ext-dir")) {
                 String v = System.getProperty("java.vendor") + "_" + System.getProperty("java.version");
                 v = v.replaceAll("\\W", "_").toLowerCase();
+                /*
+                 * The launch script greps for output starting with "java9-rt-ext-" so changing this
+                 * string will require changing the grep command in sbt-launch-lib.bash.
+                 */
                 Path rtExtDir = Paths.get(globalBase, "java9-rt-ext-" + v);
                 System.out.println(rtExtDir.toString());
                 System.exit(0);

diff --git a/src/universal/bin/sbt-launch-lib.bash b/src/universal/bin/sbt-launch-lib.bash
@@ -234,8 +234,9 @@ copyRt() {
   local at_least_9="$(expr $java_version ">=" 9)"
   if [[ "$at_least_9" == "1" ]]; then
     rtexport=$(rt_export_file)
+    # The grep for java9-rt-ext- matches the filename prefix printed in Export.java
     java9_ext=$("$java_cmd" ${JAVA_OPTS} ${SBT_OPTS:-$default_sbt_opts} ${java_args[@]} \
-      -jar "$rtexport" --rt-ext-dir | grep -v Listening)
+      -jar "$rtexport" --rt-ext-dir | grep java9-rt-ext-)
     java9_rt=$(echo "$java9_ext/rt.jar")
     vlog "[copyRt] java9_rt = '$java9_rt'"
     if [[ ! -f "$java9_rt" ]]; then