From 75311c6e57ed5da77f4cbb038448880ef5df743f Mon Sep 17 00:00:00 2001 From: Sam Halliday Date: Thu, 21 Jan 2021 10:51:00 +0000 Subject: [PATCH] nohup the server from GNU Emacs --- .../main/scala/sbt/internal/client/NetworkClient.scala | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala index 9e47c279e..9ae1125c8 100644 --- a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala +++ b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala @@ -330,8 +330,14 @@ class NetworkClient( val cmd = List(arguments.sbtScript) ++ arguments.sbtArguments ++ List(BasicCommandStrings.DashDashDetachStdio, BasicCommandStrings.DashDashServer) + + // https://github.com/sbt/sbt/issues/6271 + val nohup = + if (Util.isEmacs && !Util.isWindows) List("nohup") + else Nil + val processBuilder = - new ProcessBuilder(cmd: _*) + new ProcessBuilder((nohup ++ cmd): _*) .directory(arguments.baseDirectory) .redirectInput(Redirect.PIPE) processBuilder.environment.put(Terminal.TERMINAL_PROPS, props)