From e0c563979a83a9f02c67d26d66546cff2c564e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20Krein=C3=B8e?= Date: Mon, 28 May 2018 14:49:06 +0200 Subject: [PATCH] Made cbt shell script look for nailgun jar in /usr/share/nailgun/lib/nailgun.jar. This fixes #594 --- cbt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cbt b/cbt index 6656a9b0..1938c3b3 100755 --- a/cbt +++ b/cbt @@ -158,11 +158,13 @@ NG_EXECUTABLE=$(which ng 2>/dev/null|| env which ng-nailgun 2>/dev/null) # 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 +# on gentoo/funtoo: install via emerge nailgun. /usr/share/nailgun/lib/nailgun.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 \ + || find /usr/share/nailgun/lib/nailgun.jar 2>/dev/null \ ) nailgun_installed=0