luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes due to universal equality and the introduction of the Exec wrapper

This commit is contained in:
Dale Wijnand 2017-06-20 14:03:11 +01:00
parent 73b45f6d30
commit 53f1e2a4da
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/src/main/scala/sbt/Main.scala
View File

@ -555,7 +555,7 @@ object BuiltinCommands {
* the last* commands operate on any output since the last 'shell' command and do shift the log file. * the last* commands operate on any output since the last 'shell' command and do shift the log file.
* Otherwise, the output since the previous 'shell' command is used and the log file is not shifted. * Otherwise, the output since the previous 'shell' command is used and the log file is not shifted.
*/ */
def isLastOnly(s: State): Boolean = s.history.previous.forall(_ == Shell) def isLastOnly(s: State): Boolean = s.history.previous.forall(_.commandLine == Shell)
def printLast(s: State): Seq[String] => Unit = _ foreach println def printLast(s: State): Seq[String] => Unit = _ foreach println
@ -768,7 +768,8 @@ object BuiltinCommands {
} }
} }
private def intendsToInvokeNew(state: State) = state.remainingCommands contains TemplateCommand private def intendsToInvokeNew(state: State) =
state.remainingCommands exists (_.commandLine == TemplateCommand)
private def writeSbtVersion(state: State) = private def writeSbtVersion(state: State) =
if (!java.lang.Boolean.getBoolean("sbt.skip.version.write") && !intendsToInvokeNew(state)) if (!java.lang.Boolean.getBoolean("sbt.skip.version.write") && !intendsToInvokeNew(state))
@ -782,7 +783,7 @@ object BuiltinCommands {
} }
private def intendsToInvokeCompile(state: State) = private def intendsToInvokeCompile(state: State) =
state.remainingCommands contains Keys.compile.key.label state.remainingCommands exists (_.commandLine == Keys.compile.key.label)
private def notifyUsersAboutShell(state: State): Unit = { private def notifyUsersAboutShell(state: State): Unit = {
val suppress = Project extract state getOpt Keys.suppressSbtShellNotification getOrElse false val suppress = Project extract state getOpt Keys.suppressSbtShellNotification getOrElse false