diff options
| author | Jakob Odersky <jakob@odersky.com> | 2017-03-25 16:41:14 -0400 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2017-03-25 16:41:14 -0400 |
| commit | b8c5d590c889143a72b3ac142ee9cf416dccb02a (patch) | |
| tree | c3d0b556ec65d1562e030fdbeb17b13d6c4c1056 /cbt | |
| parent | b1da71bdb69b01feb4ce7bd90a39ffef4e8dc1b1 (diff) | |
| download | cbt-b8c5d590c889143a72b3ac142ee9cf416dccb02a.tar.gz cbt-b8c5d590c889143a72b3ac142ee9cf416dccb02a.tar.bz2 cbt-b8c5d590c889143a72b3ac142ee9cf416dccb02a.zip | |
Find nailgun-server jar on Debian
Installing nailgun via apt on Debian copies the server jar to
/usr/share/java/nailgun-server.jar. This change enables the sbt
launcher to find the jar.
Diffstat (limited to 'cbt')
| -rwxr-xr-x | cbt | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -77,7 +77,8 @@ fi # fi NG_EXECUTABLE=$(which ng || which ng-nailgun) -NG_SERVER=$(which ng-server || find /usr/local/Cellar/nailgun/*/libexec/nailgun-server-*.jar 2>/dev/null | awk '{print "java -jar " $0}') +NG_SERVER_JAR=$(find /usr/local/Cellar/nailgun/*/libexec/nailgun-server-*.jar 2>/dev/null || find /usr/share/java/nailgun-server.jar 2>/dev/null) +NG_SERVER=$(which ng-server || echo "java -jar $NG_SERVER_JAR") nailgun_installed=0 if [ "$NG_EXECUTABLE" == "" ] || [ "$NG_SERVER" == "" ]; then nailgun_installed=1 |