summaryrefslogtreecommitdiff
path: root/main/src
diff options
context:
space:
mode:
authorRobby <robby@k-state.edu>2018-03-31 14:36:53 -0500
committerRobby <robby@k-state.edu>2018-03-31 14:36:53 -0500
commitaeefd703208930f751ef3a4f2c604a25515a00fc (patch)
treedcd37f26116a68b98d2f1c6e93c41960ff9f4ea0 /main/src
parentc6572bcf363c1b58142d99c1a7093b67e3fb2e41 (diff)
downloadmill-aeefd703208930f751ef3a4f2c604a25515a00fc.tar.gz
mill-aeefd703208930f751ef3a4f2c604a25515a00fc.tar.bz2
mill-aeefd703208930f751ef3a4f2c604a25515a00fc.zip
Detect sh/batch launcher, dev.assembly, and release filename.
Diffstat (limited to 'main/src')
-rw-r--r--main/src/mill/modules/Jvm.scala6
1 files changed, 5 insertions, 1 deletions
diff --git a/main/src/mill/modules/Jvm.scala b/main/src/mill/modules/Jvm.scala
index 8e9d443e..287dc624 100644
--- a/main/src/mill/modules/Jvm.scala
+++ b/main/src/mill/modules/Jvm.scala
@@ -355,7 +355,11 @@ object Jvm {
jvmArgs: Seq[String])
(implicit ctx: Ctx.Dest)= {
val isWin = scala.util.Properties.isWin
- val outputPath = ctx.dest / "run"
+ val isBatch = isWin &&
+ !(org.jline.utils.OSUtils.IS_CYGWIN
+ || org.jline.utils.OSUtils.IS_MINGW
+ || "MSYS" == System.getProperty("MSYSTEM"))
+ val outputPath = ctx.dest / (if (isBatch) "run.bat" else "run")
val classPathStrs = classPath.map(_.toString)
write(outputPath, launcherUniversalScript(mainClass, classPathStrs, classPathStrs, jvmArgs))