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

Jump to bottom

Fixed: user defined scripts in debian overridden by generated files #97

Merged
merged 2 commits into from
Dec 4, 2013
Merged

Fixed: user defined scripts in debian overridden by generated files #97

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f1e0c7
Fixed: user defined scripts in debian overridden by generated files
kardapoltsev Dec 2, 2013
10b87ec
minor style fix
kardapoltsev Dec 2, 2013
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
10 changes: 6 additions & 4 deletions src/main/scala/com/typesafe/sbt/packager/debian/DebianPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down