azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ssh home property.

Browse Source
This commit is contained in:
Pavel Punegov
2019-03-20 14:01:23 +03:00
committed by Pavel Punegov
parent 3baee198fd
commit 98f86591f7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/plugins/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt
+5 -4
View File
@@ -173,6 +173,7 @@ private fun sshExecutor(project: Project) : ExecutorService = object : ExecutorS
private val remote: String = project.property("remote").toString() private val remote: String = project.property("remote").toString()
private val sshArgs: List<String> = System.getenv("SSH_ARGS")?.split(" ") ?: emptyList() private val sshArgs: List<String> = System.getenv("SSH_ARGS")?.split(" ") ?: emptyList()
private val sshHome = System.getenv("SSH_HOME") ?: "/usr/bin"
// Unique remote dir name to be used in the target host // Unique remote dir name to be used in the target host
private val remoteDir = run { private val remoteDir = run {
@@ -191,7 +192,7 @@ private fun sshExecutor(project: Project) : ExecutorService = object : ExecutorS
upload(executable) upload(executable)
executable = "$remoteDir/${File(executable).name}" executable = "$remoteDir/${File(executable).name}"
execFile = executable execFile = executable
commandLine = arrayListOf("/usr/bin/ssh") + sshArgs + remote + commandLine commandLine = arrayListOf("$sshHome/ssh") + sshArgs + remote + commandLine
} }
} }
cleanup(execFile!!) cleanup(execFile!!)
@@ -200,19 +201,19 @@ private fun sshExecutor(project: Project) : ExecutorService = object : ExecutorS
private fun createRemoteDir() { private fun createRemoteDir() {
project.exec { project.exec {
it.commandLine = arrayListOf("/usr/bin/ssh") + sshArgs + remote + "mkdir" + "-p" + remoteDir it.commandLine = arrayListOf("$sshHome/ssh") + sshArgs + remote + "mkdir" + "-p" + remoteDir
} }
} }
private fun upload(fileName: String) { private fun upload(fileName: String) {
project.exec { project.exec {
it.commandLine = arrayListOf("/usr/bin/scp") + sshArgs + fileName + "$remote:$remoteDir" it.commandLine = arrayListOf("$sshHome/scp") + sshArgs + fileName + "$remote:$remoteDir"
} }
} }
private fun cleanup(fileName: String) { private fun cleanup(fileName: String) {
project.exec { project.exec {
it.commandLine = arrayListOf("/usr/bin/ssh") + sshArgs + remote + "rm" + fileName it.commandLine = arrayListOf("$sshHome/ssh") + sshArgs + remote + "rm" + fileName
} }
} }
} }