Prefer normalizedName for linux-friendly packages, rather than requir…

…ing linux friendly names. Fixes #38
sbt · Sep 23, 2013 · af95396 · af95396
1 parent 6ef4ec8
commit af95396
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/src/main/scala/com/typesafe/sbt/packager/GenericPackageSettings.scala b/src/main/scala/com/typesafe/sbt/packager/GenericPackageSettings.scala
@@ -63,11 +63,11 @@ trait GenericPackageSettings
 
   def mapGenericFilesToLinux: Seq[Setting[_]] = Seq(
     // First we look at the src/linux files
-    linuxPackageMappings <++= (name in Universal, sourceDirectory in Linux) map { (pkg, dir) =>
+    linuxPackageMappings <++= (sourceDirectory in Linux) map { dir =>
       mapGenericMappingsToLinux((dir.*** --- dir) x relativeTo(dir))(identity)
     },
     // Now we look at the src/universal files.
-    linuxPackageMappings <++= (name in Universal, mappings in Universal) map { (pkg, mappings) =>
+    linuxPackageMappings <++= (normalizedName in Universal, mappings in Universal) map { (pkg, mappings) =>
       // TODO - More windows filters...
       def isWindowsFile(f: (File, String)): Boolean =
         f._2 endsWith ".bat"
@@ -77,7 +77,7 @@ trait GenericPackageSettings
       }
     },
     // Now we generate symlinks.
-    linuxPackageSymlinks <++= (name in Universal, mappings in Universal) map { (pkg, mappings) =>
+    linuxPackageSymlinks <++= (normalizedName in Universal, mappings in Universal) map { (pkg, mappings) =>
         for {
           (file, name) <- mappings
           if !file.isDirectory
@@ -86,7 +86,7 @@ trait GenericPackageSettings
         } yield LinuxSymlink("/usr/" + name, installLocation+"/"+pkg+"/"+name)
     },
     // Map configuration files
-    linuxPackageSymlinks <++= (name in Universal, mappings in Universal) map { (pkg, mappings) =>
+    linuxPackageSymlinks <++= (normalizedName in Universal, mappings in Universal) map { (pkg, mappings) =>
       val needsConfLink =
         mappings exists { case (file, name) =>
           (name startsWith "conf/") && !file.isDirectory

diff --git a/src/main/scala/com/typesafe/sbt/packager/Keys.scala b/src/main/scala/com/typesafe/sbt/packager/Keys.scala
@@ -10,6 +10,7 @@ object Keys extends linux.Keys
   with universal.UniversalKeys {
 
   // TODO - Do these keys belong here?
+  def normalizedName = sbt.Keys.normalizedName
 
   // These keys are used by the JavaApp archetype.
   val makeBashScript = TaskKey[Option[File]]("makeBashScript", "Creates or discovers the bash script used by this project.")

diff --git a/src/main/scala/com/typesafe/sbt/packager/universal/Keys.scala b/src/main/scala/com/typesafe/sbt/packager/universal/Keys.scala
@@ -19,6 +19,7 @@ object Keys extends UniversalKeys {
   def packageSrc = sbt.Keys.packageSrc
   def packageDoc = sbt.Keys.packageDoc
   def name = sbt.Keys.name
+  def normalizedName = sbt.Keys.normalizedName
   def target = sbt.Keys.target
   def sourceDirectory = sbt.Keys.sourceDirectory
   def streams = sbt.Keys.streams

diff --git a/src/main/scala/com/typesafe/sbt/packager/universal/UniversalPlugin.scala b/src/main/scala/com/typesafe/sbt/packager/universal/UniversalPlugin.scala
@@ -20,7 +20,7 @@ trait UniversalPlugin extends Plugin {
       dist <<= dist in Universal,
       stage <<= stage in Universal,
       // TODO - New default to naming, is this right?
-      name in Universal <<= (name, version) apply (_ + "-" + _)
+      name in Universal <<= (normalizedName, version) apply (_ + "-" + _)
     ) ++
     makePackageSettingsForConfig(Universal) ++
     makePackageSettingsForConfig(UniversalDocs) ++