Fix location of templates to match documentation.

sbt · Jan 5, 2014 · 61d4f3b · 61d4f3b
1 parent 5981fdc
commit 61d4f3b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/scala/com/typesafe/sbt/packager/archetypes/JavaApp.scala b/src/main/scala/com/typesafe/sbt/packager/archetypes/JavaApp.scala
@@ -44,15 +44,15 @@ object JavaAppPackaging {
       hasMain getOrElse Nil
     },
     // TODO - Overridable bash template.
-    makeBashScript <<= (bashScriptDefines, target in Universal, normalizedName, sourceDirectory in Compile) map makeUniversalBinScript,
+    makeBashScript <<= (bashScriptDefines, target in Universal, normalizedName, sourceDirectory) map makeUniversalBinScript,
     batScriptExtraDefines := Nil,
     batScriptReplacements <<= (normalizedName, Keys.mainClass in Compile, scriptClasspath, batScriptExtraDefines) map { (name, mainClass, cp, extras) =>
       mainClass map { mc =>
         JavaAppBatScript.makeReplacements(name = name, mainClass = mc, appClasspath = cp, extras = extras)
       } getOrElse Nil
 
     },
-    makeBatScript <<= (batScriptReplacements, target in Universal, normalizedName, sourceDirectory in Compile) map makeUniversalBatScript,
+    makeBatScript <<= (batScriptReplacements, target in Universal, normalizedName, sourceDirectory) map makeUniversalBatScript,
     mappings in Universal <++= (makeBashScript, normalizedName) map { (script, name) =>
       for {
         s <- script.toSeq

diff --git a/src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala b/src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala
@@ -47,12 +47,12 @@ object JavaServerAppPackaging {
             daemonUser = daemonUser)
         },
       // TODO - Default locations shouldn't be so hacky.
-      linuxStartScriptTemplate in Debian <<= (serverLoading in Debian, sourceDirectory in Compile) map { (loader, dir) =>
+      linuxStartScriptTemplate in Debian <<= (serverLoading in Debian, sourceDirectory) map { (loader, dir) =>
         JavaAppStartScript.defaultStartScriptTemplate(loader, dir / "templates" / "start")
       },
       debianMakeStartScript <<= (debianStartScriptReplacements, normalizedName, target in Universal, linuxStartScriptTemplate in Debian)
         map makeDebianStartScript,
-      linuxEtcDefaultTemplate in Debian <<= sourceDirectory in Compile map { dir =>
+      linuxEtcDefaultTemplate in Debian <<= sourceDirectory map { dir =>
         val overrideScript = dir / "templates" / "etc-default"
         if(overrideScript.exists) overrideScript.toURI.toURL
         else etcDefaultTemplateSource