Merge pull request #97 from kardapoltsev/wip/user-defined-scripts

Fixed: user defined scripts in debian overridden by generated files
sbt · Dec 4, 2013 · fbbcd9a · fbbcd9a
2 parents 61e8b64 + 10b87ec
commit fbbcd9a
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/scala/com/typesafe/sbt/packager/debian/DebianPlugin.scala b/src/main/scala/com/typesafe/sbt/packager/debian/DebianPlugin.scala
@@ -41,13 +41,15 @@ trait DebianPlugin extends Plugin with linux.LinuxPlugin {
 
   private[this] def scriptMapping(scriptName: String)(script: Option[File], controlDir: File): Seq[(File, String)] = {
     (script, controlDir) match {
-      case (Some(script), _) => Seq(script -> scriptName)
-      case (None, dir) =>
-        val script = dir / scriptName
-        if (script exists) Seq(file(script getAbsolutePath) -> scriptName) else Seq.empty
+      // check if user defined script exists
+      case (_, dir) if (dir / scriptName).exists =>
+        Seq(file((dir / scriptName).getAbsolutePath) -> scriptName)
+      // create mappings for generated script
+      case (scr, _) => scr.toSeq.map(_ -> scriptName)
     }
   }
 
+
   def debianSettings: Seq[Setting[_]] = Seq(
     debianPriority := "optional",
     debianSection := "java",