Merge pull request #401 from sbt/fix/bashscript-location

Not hardcoding bashscript config location #398
sbt · Nov 7, 2014 · 7139ba1 · 7139ba1
2 parents dc24421 + 8b0f4ae
commit 7139ba1
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala b/src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala
@@ -62,9 +62,10 @@ object JavaServerAppPackaging extends AutoPlugin {
     },
     makeEtcDefault <<= (packageName in Linux, target in Universal, linuxEtcDefaultTemplate, linuxScriptReplacements)
       map makeEtcDefaultScript,
-    linuxPackageMappings <++= (makeEtcDefault, packageName in Linux) map { (conf, name) =>
-      conf.map(c => LinuxPackageMapping(Seq(c -> ("/etc/default/" + name)),
-        LinuxFileMetaData(Users.Root, Users.Root, "644")).withConfig()).toSeq
+    linuxPackageMappings <++= (makeEtcDefault, bashScriptConfigLocation) map { (conf, configLocation) =>
+      configLocation.flatMap { path =>
+        conf.map(c => LinuxPackageMapping(Seq(c -> path), LinuxFileMetaData(Users.Root, Users.Root, "644")).withConfig())
+      }.toSeq
     }
 
   )