Skip to content

Commit

Permalink
Made cbt shell script look for nailgun jar in /usr/share/nailgun/lib/…
Browse files Browse the repository at this point in the history
…nailgun.jar. This fixes cvogt#594
  • Loading branch information
Kreinoee committed May 28, 2018
1 parent 01912ff commit e0c5639
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions cbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e0c5639

Please sign in to comment.