From 7247e7280f4f7ec255685392c507049f70250994 Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Fri, 6 Jan 2017 11:04:13 +0100 Subject: [PATCH] Two runnodes fixes for MacOS X: 1) Support users who run non-bash shells 2) Use /usr/bin/libexec to pick the right Java version, as currently Corda does not start on Java 9 --- .../src/main/resources/net/corda/plugins/runnodes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle-plugins/cordformation/src/main/resources/net/corda/plugins/runnodes b/gradle-plugins/cordformation/src/main/resources/net/corda/plugins/runnodes index b735daf054..36a47c8599 100755 --- a/gradle-plugins/cordformation/src/main/resources/net/corda/plugins/runnodes +++ b/gradle-plugins/cordformation/src/main/resources/net/corda/plugins/runnodes @@ -16,10 +16,11 @@ if which osascript >/dev/null; then rootdir=`pwd` for dir in `ls`; do if [ -d $dir ]; then + cmd="bash -c 'cd $rootdir/$dir; /usr/libexec/java_home -v 1.8 --exec java -jar JAR_NAME && exit'" script="$script tell application \"System Events\" to tell process \"Terminal\" to keystroke \"t\" using command down delay 0.5 - do script \"cd $rootdir/$dir; java -jar JAR_NAME && exit\" in window 1" + do script \"$cmd\" in window 1" first=false fi done