erik/kobalt-exec
erik/kobalt-exec
1
0
Fork 0
Code Issues Pull requests Releases Activity

Fix for new TaskResult signature.

Browse source
This commit is contained in:
Erik C. Thauvin 2017-04-18 17:52:36 -07:00
parent d56671160c
commit 5f896dc03e
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/kotlin/net/thauvin/erik/kobalt/plugin/exec/ExecPlugin.kt
View file

@ -39,10 +39,7 @@ import com.beust.kobalt.api.annotation.Task
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
import com.google.inject.Inject import com.google.inject.Inject
import com.google.inject.Singleton import com.google.inject.Singleton
import java.io.BufferedReader import java.io.*
import java.io.File
import java.io.InputStream
import java.io.InputStreamReader
import java.util.* import java.util.*
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
@ -63,11 +60,11 @@ class ExecPlugin @Inject constructor(val configActor: ConfigActor<ExecConfig>) :
@Suppress("unused") @Suppress("unused")
@Task(name = "exec", description = "Execute a command line process.") @Task(name = "exec", description = "Execute a command line process.")
fun taskExec(project: Project): TaskResult { fun taskExec(project: Project): TaskResult {
var result = TaskResult()
configurationFor(project)?.let { config -> configurationFor(project)?.let { config ->
result = executeCommands(project, config) return executeCommands(project, config)
} }
return result
return TaskResult()
} }
private fun matchOs(os: Os): Boolean { private fun matchOs(os: Os): Boolean {
@ -155,10 +152,10 @@ class ExecPlugin @Inject constructor(val configActor: ConfigActor<ExecConfig>) :
if (!success) break if (!success) break
} }
//@TODO until cedric fixes it. //@TODO until Cedric fixes it.
if (!success) error(errorMessage) if (!success) error(errorMessage)
return TaskResult(success, errorMessage.toString()) return TaskResult(success)
} }
private fun fromStream(ins: InputStream): List<String> { private fun fromStream(ins: InputStream): List<String> {