diff options
| author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2017-06-09 13:34:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-09 13:34:43 -0400 |
| commit | aef749eb54b15d46a516e6f92a2a16888c582d30 (patch) | |
| tree | b75fdd91bb750bb1ccbac14d5a9bb2b0708646b3 | |
| parent | 6b26577a5e2bd16f7e4d943f160c6fac85210e46 (diff) | |
| parent | c38c3f941b664c8a13c29709cacaa042302a9f89 (diff) | |
| download | cbt-aef749eb54b15d46a516e6f92a2a16888c582d30.tar.gz cbt-aef749eb54b15d46a516e6f92a2a16888c582d30.tar.bz2 cbt-aef749eb54b15d46a516e6f92a2a16888c582d30.zip | |
Merge pull request #510 from darthorimar/master
Eliminate unwanted output when nailgun not found
| -rwxr-xr-x | cbt | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -145,7 +145,7 @@ JAVA_OPTS_CBT=($DEBUG -Xmx1536m -Xss10M -XX:MaxJavaStackTraceDepth=-1 -XX:+Tiere # ng on osx, install via brew install nailgun # ng-nailgun on unbuntu, install via apt-get install nailgun -NG_EXECUTABLE=$(which ng || env which ng-nailgun) +NG_EXECUTABLE=$(which ng 2>/dev/null|| env which ng-nailgun 2>/dev/null) # on osx, install via brew install nailgun, /usr/local/Cellar/nailgun/*/libexec/nailgun-server-*.jar # on unbuntu, install via apt-get install nailgun, /usr/share/java/nailgun.jar @@ -157,7 +157,7 @@ NG_SERVER_JAR=$( \ ) nailgun_installed=0 -if [ "$NG_EXECUTABLE" == "" ] || [ "$NG_SERVER_JAR" == "" ]; then +if ([ "$NG_EXECUTABLE" == "" ] || [ "$NG_SERVER_JAR" == "" ]) && [ "$1" != "direct" ]; then nailgun_installed=1 echo "(Note: nailgun not found. It makes CBT faster! Try 'brew install nailgun' or 'apt-get install nailgun'.)" 1>&2 fi |