diff --git a/kobalt-exec.iml b/kobalt-exec.iml
index 2041920..3773968 100644
--- a/kobalt-exec.iml
+++ b/kobalt-exec.iml
@@ -25,18 +25,9 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
@@ -52,18 +43,9 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
diff --git a/src/main/kotlin/net/thauvin/erik/kobalt/plugin/exec/ExecPlugin.kt b/src/main/kotlin/net/thauvin/erik/kobalt/plugin/exec/ExecPlugin.kt
index f6e4a2b..1f8292e 100644
--- a/src/main/kotlin/net/thauvin/erik/kobalt/plugin/exec/ExecPlugin.kt
+++ b/src/main/kotlin/net/thauvin/erik/kobalt/plugin/exec/ExecPlugin.kt
@@ -62,7 +62,15 @@ class ExecPlugin : BasePlugin(), ITaskContributor {
if (config != null) {
config.commandLines.forEach {
- log(2, "Executing: '" + { it.args.joinToString { " " } } + "' in '{$it.dir}'")
+ val dir = if (it.dir.isNullOrBlank()) project.directory else it.dir
+ var execute = (it.os.size == 0)
+ if (!execute) {
+ val curOs: String = System.getProperty("os.name")
+ it.os.forEach {
+
+ }
+ }
+ log(2, "Executing: '" + { it.args.joinToString { " " } } + "' in '$dir'")
success = true
}
}
@@ -76,14 +84,14 @@ class ExecPlugin : BasePlugin(), ITaskContributor {
}
}
-data class CommandLine(var os: String = "", var dir: String = "", var args: Array = emptyArray())
+data class CommandLine(var args: Array = emptyArray(), var dir: String = "", var os: Array = emptyArray())
data class ExecConfig(val project: Project) {
val commandLines = arrayListOf()
@Directive
- public fun commandLine(os: String = "", dir: String = "", args: Array = emptyArray()) {
- if (args.size > 0) commandLines.add(CommandLine(os, dir, args))
+ public fun commandLine(args: Array = emptyArray(), dir: String = "", os: Array = emptyArray()) {
+ if (args.size > 0) commandLines.add(CommandLine(args, dir, os))
}
}