Skip to content

Commit 9321c88

Browse files
committed
prevent applauncher and treeannotator to grab focus when running from CLI. fixex #1212
1 parent d5cb7f1 commit 9321c88

2 files changed

Lines changed: 16 additions & 3 deletions

File tree

release/Linux/jrebin/applauncher

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,16 @@ else
5050
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":/usr/local/lib
5151
fi
5252

53+
if [ "$#" -gt 1 ]; then
54+
HEADLESS="-Djava.awt.headless=true"
55+
else
56+
HEADLESS=""
57+
fi
58+
5359
# use BEAST_EXTRA_LIBS variable to load BEAGLE and other libraries from non-default locations
5460
# this assumes that the library path contains all these libraries (or are set through LD_LIBRARY_PATH)
5561
if [ -n "$BEAST_EXTRA_LIBS" ]; then
56-
"$JAVA" -Dlauncher.wait.for.exit=true -Xss256m -Xmx8g -Djava.library.path="$BEAST_EXTRA_LIBS" -Duser.language=en -cp "$BEAST_LIB/launcher.jar" beast.pkgmgmt.launcher.AppLauncherLauncher $*
62+
"$JAVA" $HEADLESS -Dlauncher.wait.for.exit=true -Xss256m -Xmx8g -Djava.library.path="$BEAST_EXTRA_LIBS" -Duser.language=en -cp "$BEAST_LIB/launcher.jar" beast.pkgmgmt.launcher.AppLauncherLauncher $*
5763
else
58-
"$JAVA" -Dlauncher.wait.for.exit=true -Xss256m -Xmx8g -Duser.language=en -cp "$BEAST_LIB/launcher.jar" beast.pkgmgmt.launcher.AppLauncherLauncher $*
64+
"$JAVA" $HEADLESS -Dlauncher.wait.for.exit=true -Xss256m -Xmx8g -Duser.language=en -cp "$BEAST_LIB/launcher.jar" beast.pkgmgmt.launcher.AppLauncherLauncher $*
5965
fi

release/Linux/jrebin/treeannotator

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,12 @@ if [ -z "$JAVA_HOME" ]; then
3030
else
3131
JAVA="$JAVA_HOME"/bin/java
3232
fi
33-
"$JAVA" -Dlauncher.wait.for.exit=true -Xss256m -Xmx8g -Djava.library.path="$BEAST_LIB" -Duser.language=en -cp "$BEAST_LIB/launcher.jar" beast.pkgmgmt.launcher.TreeAnnotatorLauncher $*
33+
34+
if [ "$#" -gt 1 ]; then
35+
HEADLESS="-Djava.awt.headless=true"
36+
else
37+
HEADLESS=""
38+
fi
39+
40+
"$JAVA" $HEADLESS -Dlauncher.wait.for.exit=true -Xss256m -Xmx8g -Djava.library.path="$BEAST_LIB" -Duser.language=en -cp "$BEAST_LIB/launcher.jar" beast.pkgmgmt.launcher.TreeAnnotatorLauncher $*
3441

0 commit comments

Comments
 (0)