ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-20 17:33:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #409 from corda/aslemmer-fix-runnodes-add-tmux

Browse Source 
Aslemmer fix runnodes add tmux
This commit is contained in:
Andras Slemmer 2017-03-23 16:13:55 +00:00 committed by GitHub
commit 660e570b48
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gradle-plugins/cordformation/src/noderunner/kotlin/net/corda/plugins/NodeRunner.kt
View File

@ -59,21 +59,33 @@ private fun execJar(jarName: String, dir: File, args: List<String> = listOf()):
private fun execJarInTerminalWindow(jarName: String, dir: File, args: List<String> = listOf()): Process {
val javaCmd = "java -jar $jarName " + args.joinToString(" ") { it }
val nodeName = dir.toPath().fileName + " " + jarName
val nodeName = "${dir.toPath().fileName} $jarName"
val osName = System.getProperty("os.name", "generic").toLowerCase(Locale.ENGLISH)
val cmd = if ((osName.indexOf("mac") >= 0) || (osName.indexOf("darwin") >= 0)) {
"""osascript -e "tell app "Terminal
val builder = if ((osName.indexOf("mac") >= 0) || (osName.indexOf("darwin") >= 0)) {
ProcessBuilder(
"osascript", "-e",
"""tell app "Terminal
activate
tell application \"System Events\" to tell process \"Terminal\" to keystroke \"t\" using command down
delay 0.5
do script "bash -c 'cd $dir; /usr/libexec/java_home -v 1.8 --exec $javaCmd && exit'" in window 1"
"""
do script "bash -c 'cd $dir; /usr/libexec/java_home -v 1.8 --exec $javaCmd && exit'" in window 1"""
)
} else if (osName.indexOf("win") >= 0) {
"""cmd /C "start $javaCmd""""
ProcessBuilder(
"cmd", "/C", "start $javaCmd"
)
} else {
// Assume Linux
"""xterm -T "$nodeName" -e $javaCmd"""
val isTmux = System.getenv("TMUX")?.isNotEmpty() ?: false
if (isTmux) {
ProcessBuilder(
"tmux", "new-window", "-n", nodeName, javaCmd
)
} else {
ProcessBuilder(
"xterm", "-T", nodeName, "-e", javaCmd
)
}
}
return Runtime.getRuntime().exec(cmd, null, dir)
return builder.directory(dir).start()
}

2
publish.properties
View File

@ -1 +1 @@
gradlePluginsVersion=0.10.1
gradlePluginsVersion=0.10.2