Merge pull request #581 from francisdb/master

re #577 fix for running the bash file in a path with spaces

src/main/resources/com/typesafe/sbt/packager/archetypes/bash-template

@@ -235,9 +235,9 @@ run() {
   fi
 
   if [ -n "$custom_mainclass" ]; then
-    mainclass="$custom_mainclass"
+    mainclass=("$custom_mainclass")
   else
-    mainclass="$app_mainclass"
+    mainclass=("${app_mainclass[@]}")
   fi
 
   # Now we check to see if there are any java opts on the environment. These get listed first, with the script able to override them.
@@ -250,7 +250,7 @@ run() {
     ${java_opts[@]} \
     "${java_args[@]}" \
     -cp "$(fix_classpath "$app_classpath")" \
-    $mainclass \
+    "${mainclass[@]}" \
     "${app_commands[@]}" \
     "${residual_args[@]}"
 

src/main/scala/com/typesafe/sbt/packager/archetypes/JavaAppBashScript.scala

@@ -45,7 +45,14 @@ object JavaAppBashScript {
   def configFileDefine(configFile: String) =
     "declare -r script_conf_file=\"%s\"" format (configFile)
 
-  def mainClassDefine(mainClass: String) =
-    "declare -r app_mainclass=\"%s\"\n" format (mainClass)
+  def mainClassDefine(mainClass: String) = {
+    val jarPrefixed = """^\-jar (.*)""".r
+    val args = mainClass match {
+      case jarPrefixed(jarName) => Seq("-jar", jarName)
+      case className           => Seq(className)
+    }
+    val quotedArgsSpaceSeparated = args.map(s => "\"" + s + "\"").mkString(" ")
+    "declare -a app_mainclass=(%s)\n" format (quotedArgsSpaceSeparated)
+  }
 
 }

src/sbt-test/jar/launcher-jar with spaces/build.sbt

@@ -0,0 +1,39 @@
+enablePlugins(LauncherJarPlugin)
+
+name := "launcher-jar-test"
+
+version := "0.1.0"
+
+// test dependencies sample
+libraryDependencies ++= Seq(
+  "com.typesafe.akka" %% "akka-kernel" % "2.3.4"
+)
+
+TaskKey[Unit]("check-classpath") := {
+  val dir = (stagingDirectory in Universal).value
+  val bat = IO.read(dir / "bin" / "launcher-jar-test.bat")
+  assert(bat contains "set \"APP_CLASSPATH=\"", "bat should set APP_CLASSPATH:\n" + bat)
+  assert(bat contains "set \"APP_MAIN_CLASS=-jar %APP_LIB_DIR%\\launcher-jar-test.launcher-jar-test-0.1.0-launcher.jar\"",
+   "bat should set APP_MAIN_CLASS:\n" + bat)
+  val bash = IO.read(dir / "bin" / "launcher-jar-test")
+  assert(bash contains "declare -r app_classpath=\"\"", "bash should declare app_classpath:\n" + bash)
+  assert(bash contains "declare -a app_mainclass=(\"-jar\" \"$lib_dir/launcher-jar-test.launcher-jar-test-0.1.0-launcher.jar\")",
+   "bash should declare app_mainclass:\n" + bash)
+  val jar = new java.util.jar.JarFile(dir / "lib" / "launcher-jar-test.launcher-jar-test-0.1.0-launcher.jar")
+  val attributes = jar.getManifest().getMainAttributes()
+  assert(attributes.getValue("Class-Path").toString() contains "com.typesafe.akka.akka-actor",
+   "MANIFEST Class-Path should contain akka-actor:\n" + attributes.getValue("Class-Path").toString())
+  assert(attributes.getValue("Main-Class").toString() contains "test.Test",
+   "MANIFEST Main-Class should contain test.Test:\n" + attributes.getValue("Main-Class").toString())
+  jar close
+}
+
+TaskKey[Unit]("run-check") := { 
+  val dir = (stagingDirectory in Universal).value
+  val cmd = if(System.getProperty("os.name").contains("Windows")){
+    Seq("cmd", "/c", (dir / "bin" / "launcher-jar-test.bat").getAbsolutePath)
+  }else{
+    Seq((dir / "bin" / "launcher-jar-test").getAbsolutePath)
+  }
+  assert(Process(cmd).!! contains "SUCCESS!")
+}

src/sbt-test/jar/launcher-jar with spaces/project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % sys.props("project.version"))

src/sbt-test/jar/launcher-jar with spaces/src/main/scala/test/Test.scala

@@ -0,0 +1,19 @@
+package test
+
+// use dependency library
+
+import akka.actor._
+import akka.routing.RoundRobinRouter
+
+class PrintActor extends Actor{
+  def receive = {
+    case msg => println(msg)
+  }
+}
+
+object Test extends App {
+  val system = ActorSystem("testSystem")
+  val router = system.actorOf(Props[PrintActor])
+  router ! "SUCCESS!!"
+  system.shutdown
+}

src/sbt-test/jar/launcher-jar with spaces/src/templates/bat-template

@@ -0,0 +1,21 @@
+@echo off
+rem this template is minimal for test independent
+
+@setlocal enabledelayedexpansion
+@echo off
+
+set "@@APP_ENV_NAME@@_HOME=%~dp0\\.."
+
+set "APP_LIB_DIR=%@@APP_ENV_NAME@@_HOME%\lib\"
+
+set _JAVACMD=%JAVACMD%
+
+if "%_JAVACMD%"=="" (
+  if not "%JAVA_HOME%"=="" (
+    if exist "%JAVA_HOME%\bin\java.exe" set "_JAVACMD=%JAVA_HOME%\bin\java.exe"
+  )
+)
+
+@@APP_DEFINES@@
+
+"%_JAVACMD%" -cp "%APP_CLASSPATH%" %APP_MAIN_CLASS% %*

src/sbt-test/jar/launcher-jar with spaces/test

@@ -0,0 +1,5 @@
+# Run the staging and check the script.
+> stage
+$ exists target/universal/stage/lib/launcher-jar-test.launcher-jar-test-0.1.0-launcher.jar
+> check-classpath
+> run-check

src/sbt-test/jar/launcher-jar/build.sbt

@@ -17,7 +17,7 @@ TaskKey[Unit]("check-classpath") := {
    "bat should set APP_MAIN_CLASS:\n" + bat)
   val bash = IO.read(dir / "bin" / "launcher-jar-test")
   assert(bash contains "declare -r app_classpath=\"\"", "bash should declare app_classpath:\n" + bash)
-  assert(bash contains "declare -r app_mainclass=\"-jar $lib_dir/launcher-jar-test.launcher-jar-test-0.1.0-launcher.jar\"",
+  assert(bash contains "declare -a app_mainclass=(\"-jar\" \"$lib_dir/launcher-jar-test.launcher-jar-test-0.1.0-launcher.jar\")",
    "bash should declare app_mainclass:\n" + bash)
   val jar = new java.util.jar.JarFile(dir / "lib" / "launcher-jar-test.launcher-jar-test-0.1.0-launcher.jar")
   val attributes = jar.getManifest().getMainAttributes()