From 14025146485171a2153b3f7a887a223c8c562246 Mon Sep 17 00:00:00 2001 From: Olivier Mélois Date: Sun, 25 Feb 2018 17:51:59 +0000 Subject: Changed the default home location (#163) * Mill's default home folder is now $HOME/.mill/ammonite This lets users provide global settings by defining a predef.sc file in that home folder. * Re-enabled the --home cli param to manually set the home folder --- main/src/mill/Main.scala | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'main/src') diff --git a/main/src/mill/Main.scala b/main/src/mill/Main.scala index ef6cfc11..7b7e2bb2 100644 --- a/main/src/mill/Main.scala +++ b/main/src/mill/Main.scala @@ -99,7 +99,7 @@ object Main { stderr: PrintStream): (Boolean, Option[Evaluator.State]) = { import ammonite.main.Cli - val removed = Set("predef-code", "home", "no-home-predef") + val removed = Set("predef-code", "no-home-predef") var interactive = false val interactiveSignature = Arg[Config, Unit]( "interactive", Some('i'), @@ -112,10 +112,12 @@ object Main { val millArgSignature = Cli.genericSignature.filter(a => !removed(a.name)) :+ interactiveSignature + val millHome = home / ".mill" / "ammonite" + Cli.groupArgs( args.toList, millArgSignature, - Cli.Config(remoteLogging = false) + Cli.Config(home = millHome, remoteLogging = false) ) match{ case _ if interactive => stderr.println("-i/--interactive must be passed in as the first argument") @@ -154,7 +156,7 @@ object Main { ) val runner = new mill.main.MainRunner( - config.copy(home = pwd / "out" / ".ammonite", colored = Some(mainInteractive)), + config.copy(colored = Some(mainInteractive)), stdout, stderr, stdin, stateCache ) -- cgit v1.2.3