From 1c614fd6999d2c641d684fa7dab98357c650a737 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Tue, 7 Mar 2017 13:30:56 +0000
Subject: [PATCH] Instruct how to get into interactive mode directly

---
 main/command/src/main/scala/sbt/MainLoop.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/main/command/src/main/scala/sbt/MainLoop.scala b/main/command/src/main/scala/sbt/MainLoop.scala
index 915902b1f..292f8e2b8 100644
--- a/main/command/src/main/scala/sbt/MainLoop.scala
+++ b/main/command/src/main/scala/sbt/MainLoop.scala
@@ -67,8 +67,10 @@ object MainLoop {
       val loggedState = state.copy(globalLogging = newLogging)
       def isInteractive = System.console() != null
       def hasShell = state.remainingCommands contains "shell"
-      if (isInteractive && !hasShell)
-        state.log warn "Executing in batch mode; for better performance, hit [ENTER] to remain in the sbt shell"
+      if (isInteractive && !hasShell) {
+        state.log warn "BATCH MODE: for better performance hit [ENTER] to switch to interactive mode"
+        state.log warn "  consider launching sbt without any commands, or explicitly passing 'shell'"
+      }
       try run(loggedState) finally out.close()
     }