From 66427a7a307c696c7f27c8b48c9d68391977ccf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <endre.varga@drewhk.com>
Date: Tue, 25 Jun 2013 16:30:40 +0200
Subject: [PATCH] Replaced multi-line strings with \n and concatenation #3462

If multi-line strings are used, the encoding of the source file will determine the result. Since the same file generates *nix and Windows scripts, no encoding will be correct except if explicit \n markers are used.
---
 .../src/main/scala/AkkaKernelPlugin.scala     | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala b/akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala
index 5e2b172abf..1258e571dc 100644
--- a/akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala
+++ b/akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala
@@ -132,23 +132,18 @@ object AkkaKernelPlugin extends Plugin {
       DistScript("start.bat", distBatScript, true))
 
     private def distShScript =
-      """|#!/bin/sh
-    |
-    |AKKA_HOME="$(cd "$(cd "$(dirname "$0")"; pwd -P)"/..; pwd)"
-    |AKKA_CLASSPATH="$AKKA_HOME/config:$AKKA_HOME/lib/*"
-    |JAVA_OPTS="%s"
-    |
-    |java $JAVA_OPTS -cp "$AKKA_CLASSPATH" -Dakka.home="$AKKA_HOME" %s%s "$@"
-    |""".stripMargin.format(jvmOptions, mainClass, if (bootClass.nonEmpty) " " + bootClass else "")
+      ("#!/bin/sh\n\n" +
+        "AKKA_HOME=\"$(cd \"$(cd \"$(dirname \"$0\")\"; pwd -P)\"/..; pwd)\"\n" +
+        "AKKA_CLASSPATH=\"$AKKA_HOME/config:$AKKA_HOME/lib/*\"\n" +
+        "JAVA_OPTS=\"%s\"\n\n" +
+        "java $JAVA_OPTS -cp \"$AKKA_CLASSPATH\" -Dakka.home=\"$AKKA_HOME\" %s%s \"$@\"\n").format(jvmOptions, mainClass, if (bootClass.nonEmpty) " " + bootClass else "")
 
     private def distBatScript =
-      """|@echo off
-    |set AKKA_HOME=%%~dp0..
-    |set AKKA_CLASSPATH=%%AKKA_HOME%%\config;%%AKKA_HOME%%\lib\*
-    |set JAVA_OPTS=%s
-    |
-    |java %%JAVA_OPTS%% -cp "%%AKKA_CLASSPATH%%" -Dakka.home="%%AKKA_HOME%%" %s%s %%*
-    |""".stripMargin.format(jvmOptions, mainClass, if (bootClass.nonEmpty) " " + bootClass else "")
+      ("@echo off\r\n\r\n" +
+        "set AKKA_HOME=%%~dp0..\r\n" +
+        "set AKKA_CLASSPATH=%%AKKA_HOME%%\\config;%%AKKA_HOME%%\\lib\\*\r\n" +
+        "set JAVA_OPTS=%s\r\n\r\n" +
+        "java %%JAVA_OPTS%% -cp \"%%AKKA_CLASSPATH%%\" -Dakka.home=\"%%AKKA_HOME%%\" %s%s %%*\r\n").format(jvmOptions, mainClass, if (bootClass.nonEmpty) " " + bootClass else "")
 
     private def setExecutable(target: File, executable: Boolean): Option[String] = {
       val success = target.setExecutable(executable, false)