Fixed SystemVPlugin override start script behavior, and added overrid…

…e tests for rpm

src/main/scala/com/typesafe/sbt/packager/archetypes/systemloader/SystemVPlugin.scala

@@ -65,7 +65,7 @@ object SystemVPlugin extends AutoPlugin {
       Seq(
         // set the template
         linuxStartScriptTemplate := linuxStartScriptUrl(
-          (sourceDirectory in Compile).value,
+          sourceDirectory.value,
           serverLoading.value,
           "start-rpm-template"
         )

src/sbt-test/rpm/override-start-script-systemd/build.sbt

@@ -0,0 +1,36 @@
+enablePlugins(JavaServerAppPackaging, SystemdPlugin)
+
+name := "rpm-test"
+
+version := "0.1.0"
+
+maintainer := "Mitch Seymour <mitchseymour@gmail.com>"
+
+packageSummary := "Test rpm package"
+
+executableScriptName := "rpm-exec"
+
+packageDescription := """A fun package description of our software,
+  with multiple lines."""
+
+rpmRelease := "1"
+
+rpmVendor := "typesafe"
+
+rpmUrl := Some("http://github.com/sbt/sbt-native-packager")
+
+rpmLicense := Some("BSD")
+
+rpmGroup := Some("test-group")
+
+TaskKey[Unit]("unzip") <<= (packageBin in Rpm, streams) map { (rpmFile, streams) =>
+  val rpmPath = Seq(rpmFile.getAbsolutePath)
+  Process("rpm2cpio", rpmPath) #| Process("cpio -i --make-directories") ! streams.log
+  ()
+}
+
+TaskKey[Unit]("checkStartupScript") <<= (target, streams) map { (target, out) =>
+  val script = IO.read(file("usr/lib/systemd/system/rpm-test.service"))
+  assert(script.startsWith("# right systemd template"), s"override script wasn't picked, script is\n$script")
+  ()
+}

src/sbt-test/rpm/override-start-script-systemd/project/plugins.sbt

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

src/sbt-test/rpm/override-start-script-systemd/src/templates/start

@@ -0,0 +1,2 @@
+# check that old start template isn't picked
+# wrong start template

src/sbt-test/rpm/override-start-script-systemd/src/templates/systemloader/systemd

@@ -0,0 +1 @@
+# right systemd template

src/sbt-test/rpm/override-start-script-systemd/test

@@ -0,0 +1,10 @@
+# Run the rpm packaging.
+> rpm:package-bin
+$ exists target/rpm/RPMS/noarch/rpm-test-0.1.0-1.noarch.rpm
+
+> unzip
+# Bootscript != executable Script
+$ exists /usr/lib/systemd/system/rpm-test.service
+# $ exists usr/share/rpm-test/bin/rpm-exec
+
+> checkStartupScript

src/sbt-test/rpm/override-start-script-systemv/build.sbt

@@ -0,0 +1,36 @@
+enablePlugins(JavaServerAppPackaging, SystemVPlugin)
+
+name := "rpm-test"
+
+version := "0.1.0"
+
+maintainer := "Mitch Seymour <mitchseymour@gmail.com>"
+
+packageSummary := "Test rpm package"
+
+executableScriptName := "rpm-exec"
+
+packageDescription := """A fun package description of our software,
+  with multiple lines."""
+
+rpmRelease := "1"
+
+rpmVendor := "typesafe"
+
+rpmUrl := Some("http://github.com/sbt/sbt-native-packager")
+
+rpmLicense := Some("BSD")
+
+rpmGroup := Some("test-group")
+
+TaskKey[Unit]("unzip") <<= (packageBin in Rpm, streams) map { (rpmFile, streams) =>
+  val rpmPath = Seq(rpmFile.getAbsolutePath)
+  Process("rpm2cpio", rpmPath) #| Process("cpio -i --make-directories") ! streams.log
+  ()
+}
+
+TaskKey[Unit]("checkStartupScript") <<= (target, streams) map { (target, out) =>
+  val script = IO.read(file("etc/init.d/rpm-test"))
+  assert(script.startsWith("# right systemv template"), s"override script wasn't picked, script is\n$script")
+  ()
+}

src/sbt-test/rpm/override-start-script-systemv/project/plugins.sbt

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

src/sbt-test/rpm/override-start-script-systemv/src/templates/start

@@ -0,0 +1,2 @@
+# check that old start template isn't picked
+# wrong start template

src/sbt-test/rpm/override-start-script-systemv/src/templates/systemloader/systemv

@@ -0,0 +1 @@
+# right systemv template

src/sbt-test/rpm/override-start-script-systemv/test

@@ -0,0 +1,10 @@
+# Run the rpm packaging.
+> rpm:package-bin
+$ exists target/rpm/RPMS/noarch/rpm-test-0.1.0-1.noarch.rpm
+
+> unzip
+# Bootscript != executable Script
+$ exists etc/init.d/rpm-test
+# $ exists usr/share/rpm-test/bin/rpm-exec
+
+> checkStartupScript

src/sbt-test/rpm/override-start-script-upstart/build.sbt

@@ -0,0 +1,36 @@
+enablePlugins(JavaServerAppPackaging, UpstartPlugin)
+
+name := "rpm-test"
+
+version := "0.1.0"
+
+maintainer := "Mitch Seymour <mitchseymour@gmail.com>"
+
+packageSummary := "Test rpm package"
+
+executableScriptName := "rpm-exec"
+
+packageDescription := """A fun package description of our software,
+  with multiple lines."""
+
+rpmRelease := "1"
+
+rpmVendor := "typesafe"
+
+rpmUrl := Some("http://github.com/sbt/sbt-native-packager")
+
+rpmLicense := Some("BSD")
+
+rpmGroup := Some("test-group")
+
+TaskKey[Unit]("unzip") <<= (packageBin in Rpm, streams) map { (rpmFile, streams) =>
+  val rpmPath = Seq(rpmFile.getAbsolutePath)
+  Process("rpm2cpio", rpmPath) #| Process("cpio -i --make-directories") ! streams.log
+  ()
+}
+
+TaskKey[Unit]("checkStartupScript") <<= (target, streams) map { (target, out) =>
+  val script = IO.read(file("etc/init/rpm-test.conf"))
+  assert(script.startsWith("# right upstart template"), s"override script wasn't picked, script is\n$script")
+  ()
+}

src/sbt-test/rpm/override-start-script-upstart/project/plugins.sbt

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

src/sbt-test/rpm/override-start-script-upstart/src/templates/start

@@ -0,0 +1,2 @@
+# check that old start template isn't picked
+# wrong start template

src/sbt-test/rpm/override-start-script-upstart/src/templates/systemloader/upstart

@@ -0,0 +1 @@
+# right upstart template

src/sbt-test/rpm/override-start-script-upstart/test

@@ -0,0 +1,10 @@
+# Run the rpm packaging.
+> rpm:package-bin
+$ exists target/rpm/RPMS/noarch/rpm-test-0.1.0-1.noarch.rpm
+
+> unzip
+# Bootscript != executable Script
+$ exists etc/init/rpm-test.conf
+# $ exists usr/share/rpm-test/bin/rpm-exec
+
+> checkStartupScript