diff options
| -rwxr-xr-x | cbt | 6 | ||||
| -rw-r--r-- | stage1/Stage1.scala | 2 | ||||
| -rw-r--r-- | stage2/ToolsStage2.scala | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -155,7 +155,11 @@ else fi use_nailgun=0 -if [ $nailgun_installed -eq 1 ] || [ "$1" = "publishSigned" ] || [ "$2" = "publishSigned" ] || [ "$1" = "direct" ] || [ "$2" = "direct" ]; then +if [ "$1" = "direct" ]; then + use_nailgun=1 + shift +fi +if [ $nailgun_installed -eq 1 ] || [ "$1" = "publishSigned" ]; then use_nailgun=1 fi diff --git a/stage1/Stage1.scala b/stage1/Stage1.scala index 85ec0e9..2178b5b 100644 --- a/stage1/Stage1.scala +++ b/stage1/Stage1.scala @@ -173,7 +173,7 @@ object Stage1{ val stage2Args = new Stage2Args( new File( args.args(0) ), - args.args.drop(1).dropWhile(_ == "direct").toVector, + args.args.drop(1).toVector, // launcher changes cause entire nailgun restart, so no need for them here stage2LastModified = stage2LastModified, cache, diff --git a/stage2/ToolsStage2.scala b/stage2/ToolsStage2.scala index ba7a27f..7765e82 100644 --- a/stage2/ToolsStage2.scala +++ b/stage2/ToolsStage2.scala @@ -2,7 +2,7 @@ package cbt import java.io._ object ToolsStage2 extends Stage2Base{ def run( _args: Stage2Args ): ExitCode = { - val args = _args.args.dropWhile(Seq("tools","direct") contains _) + val args = _args.args.dropWhile(Seq("tools") contains _) val lib = new Lib(_args.logger) val toolsTasks = new ToolsTasks(lib, args, _args.cwd, _args.cache, _args.cbtHome, _args.stage2LastModified)(_args.classLoaderCache) lib.callReflective(toolsTasks, args.lift(0), null) |