Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

If mappings are empty don't add them to the linuxPackageMappings #917

Merged
merged 1 commit into from
Nov 19, 2016
Merged

If mappings are empty don't add them to the linuxPackageMappings #917

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions src/main/scala/com/typesafe/sbt/packager/linux/LinuxPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,20 +102,17 @@ object LinuxPlugin extends AutoPlugin {
*/
def mapGenericFilesToLinux: Seq[Setting[_]] = Seq(
// First we look at the src/linux files
linuxPackageMappings <++= (sourceDirectory in Linux) map { dir =>
mapGenericMappingsToLinux(MappingsHelper contentOf dir, Users.Root, Users.Root)(identity)
linuxPackageMappings ++= {
val linuxContent = MappingsHelper.contentOf((sourceDirectory in Linux).value)
if (linuxContent.isEmpty) Seq.empty
else mapGenericMappingsToLinux(linuxContent, Users.Root, Users.Root)(identity)
},
// Now we look at the src/universal files.
linuxPackageMappings <++= (packageName in Linux, mappings in Universal, defaultLinuxInstallLocation) map {
(pkg, mappings, installLocation) =>
// TODO - More windows filters...
def isWindowsFile(f: (File, String)): Boolean =
f._2 endsWith ".bat"

mapGenericMappingsToLinux(mappings filterNot isWindowsFile, Users.Root, Users.Root) { name =>
installLocation + "/" + pkg + "/" + name
}
},
linuxPackageMappings ++= getUniversalFolderMappings(
(packageName in Linux).value,
defaultLinuxInstallLocation.value,
(mappings in Universal).value
),
// Now we generate symlinks.
linuxPackageSymlinks <++= (packageName in Linux, mappings in Universal, defaultLinuxInstallLocation) map {
(pkg, mappings, installLocation) =>
Expand Down Expand Up @@ -236,4 +233,19 @@ object LinuxPlugin extends AutoPlugin {
final def chdir(installLocation: String, packageName: String): String =
s"$installLocation/$packageName"

private[this] def getUniversalFolderMappings(pkg: String,
installLocation: String,
mappings: Seq[(File, String)]): Seq[LinuxPackageMapping] = {
// TODO - More windows filters...
def isWindowsFile(f: (File, String)): Boolean =
f._2 endsWith ".bat"

val filtered = mappings.filterNot(isWindowsFile)

if (filtered.isEmpty) Seq.empty
else
mapGenericMappingsToLinux(filtered, Users.Root, Users.Root) { name =>
installLocation + "/" + pkg + "/" + name
}
}
}