ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-20 05:28:21 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #8 from corda/clint-javahomefix

Browse Source 
Fix an error in runnodes when running on Linux
This commit is contained in:
Clinton 2016-11-30 16:06:15 +00:00 committed by GitHub
commit e873347892
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -1,8 +1,8 @@
buildscript { buildscript {
// Our version: bump this on release. // Our version: bump this on release.
ext.corda_version = "0.7-SNAPSHOT" ext.corda_version = "0.7-SNAPSHOT"
ext.gradle_plugins_version = "0.6.1"
ext.gradle_plugins_version = "0.5.7"
ext.kotlin_version = '1.0.5' ext.kotlin_version = '1.0.5'
ext.quasar_version = '0.7.6' ext.quasar_version = '0.7.6'
ext.asm_version = '0.5.3' ext.asm_version = '0.5.3'

2
gradle-plugins/build.gradle
View File

@ -2,7 +2,7 @@
// or if you are developing these plugins. See the readme for more information. // or if you are developing these plugins. See the readme for more information.
buildscript { buildscript {
ext.gradle_plugins_version = "0.6" // Our version: bump this on release. ext.gradle_plugins_version = "0.6.1" // Our version: bump this on release.
ext.corda_published_version = "0.5" // Depend on our existing published publishing plugin. ext.corda_published_version = "0.5" // Depend on our existing published publishing plugin.
repositories { repositories {

12
gradle-plugins/cordformation/src/main/resources/net/corda/plugins/runnodes
View File

@ -27,11 +27,13 @@ if which osascript >/dev/null; then
end tell" end tell"
osascript -e "$script" osascript -e "$script"
else else
# Some other UNIX, probably Linux # Some other UNIX, probably Linux (does not support msys or cygwin)
# TODO: msys and cygwin support
# #
# This next line is safe even if JAVA_HOME is unset. If it is set, it means that java overrides the # If it is set, it means that java overrides the default system java, which is what we want.
# default system java, which is what we want. if [ -n "${JAVA_HOME-}" ]; then
export PATH=$JAVA_HOME/bin:$PATH export PATH="$JAVA_HOME/bin:$PATH"
fi
for dir in `ls`; do for dir in `ls`; do
if [ -d $dir ]; then if [ -d $dir ]; then
pushd $dir >/dev/null pushd $dir >/dev/null
@ -39,4 +41,4 @@ else
popd >/dev/null popd >/dev/null
fi fi
done done
fi fi