aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Christopher Vogt <oss.nsp@cvogt.org>2017-07-11 13:54:11 -0400
committerGitHub <noreply@github.com>2017-07-11 13:54:11 -0400
commit544b24b5b663633f4b94aacedfa6cdd9a6b3318a (patch)
tree4eb386eefa6f4c85bc72fb215f2d25fc6d2b3442
parentee42b0d7efb39a2ea4327919dfcf7fc3265b4cf7 (diff)
parent456e737559dce979e973815a68a9890e24470ec9 (diff)
downloadcbt-544b24b5b663633f4b94aacedfa6cdd9a6b3318a.tar.gz
cbt-544b24b5b663633f4b94aacedfa6cdd9a6b3318a.tar.bz2
cbt-544b24b5b663633f4b94aacedfa6cdd9a6b3318a.zip
Merge pull request #547 from cvogt/nailgun-server-fedora
locate nailgun server on fedora
-rwxr-xr-xcbt8
1 files changed, 5 insertions, 3 deletions
diff --git a/cbt b/cbt
index 1733077..1ec2d0f 100755
--- a/cbt
+++ b/cbt
@@ -147,13 +147,15 @@ JAVA_OPTS_CBT=($DEBUG -Xmx1536m -Xss10M "-XX:MaxJavaStackTraceDepth=-1" -XX:+Tie
# ng-nailgun on unbuntu, install via apt-get install 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
-# on debian, install via apt-get install nailgun, /usr/share/java/nailgun-server.jar
+# 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
+# on debian: install via apt-get install nailgun. /usr/share/java/nailgun-server.jar
+# on fedora: install via dnf install nailgun. /usr/share/java/nailgun/nailgun-server.jar
NG_SERVER_JAR=$( \
find /usr/local/Cellar/nailgun/*/libexec/nailgun-server-*.jar 2>/dev/null \
|| find /usr/share/java/nailgun.jar 2>/dev/null \
|| find /usr/share/java/nailgun-server.jar 2>/dev/null \
+ || find /usr/share/java/nailgun/nailgun-server.jar 2>/dev/null \
)
nailgun_installed=0