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

Issue 984 depend on conffiles #986

Merged
merged 2 commits into from
May 26, 2017
Merged

Issue 984 depend on conffiles #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b27ec2
Cleanup imports
muuki88 May 25, 2017
067697a
FIX #984 Debian packaging depends on debianControlFile and debianConf…
muuki88 May 25, 2017
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
9 changes: 3 additions & 6 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 @@ -190,9 +190,6 @@ object DebianPlugin extends AutoPlugin with DebianNativePackaging {
debianMD5sumsFile := createMD5SumFile(stage.value),
debianMakeChownReplacements := makeChownReplacements(linuxPackageMappings.value, streams.value),
stage := {
// depend on both tasks
debianControlFile.value
debianChangelog.value
val debianTarget = target.value

stageMappings(linuxPackageMappings.value, debianTarget)
Expand All @@ -210,9 +207,9 @@ object DebianPlugin extends AutoPlugin with DebianNativePackaging {
// TODO remove in next major release
debianExplodedPackage := stage.value,
// Replacement for ${{header}} as debian control scripts are bash scripts
linuxScriptReplacements += ("header" -> "#!/bin/sh\nset -e")

// Adding package specific implementation settings
linuxScriptReplacements += ("header" -> "#!/bin/sh\nset -e"),
stage := (stage dependsOn debianControlFile).value,
stage := (stage dependsOn debianConffilesFile).value
)
)

Expand Down
18 changes: 8 additions & 10 deletions src/main/scala/com/typesafe/sbt/packager/debian/JDebPackaging.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package com.typesafe.sbt
package packager
package debian
package com.typesafe.sbt.packager.debian

import com.typesafe.sbt.packager.archetypes.TemplateWriter
import com.typesafe.sbt.packager.universal.Archives
import sbt._
import sbt.Keys.{mappings, normalizedName, packageBin, streams, target, version}
import linux.{LinuxFileMetaData, LinuxPackageMapping, LinuxSymlink}
import linux.LinuxPlugin.autoImport.{
import sbt.Keys.{normalizedName, packageBin, streams, target, version}
import com.typesafe.sbt.packager.linux.{LinuxFileMetaData, LinuxPackageMapping, LinuxSymlink}
import com.typesafe.sbt.packager.linux.LinuxPlugin.autoImport.{
linuxPackageMappings,
linuxPackageSymlinks,
linuxScriptReplacements,
Expand All @@ -17,7 +15,7 @@ import scala.collection.JavaConversions._
import org.vafer.jdeb.{DataProducer, DebMaker}
import org.vafer.jdeb.mapping._
import org.vafer.jdeb.producers._
import DebianPlugin.{Names}
import DebianPlugin.Names
import DebianPlugin.autoImport._

/**
Expand Down Expand Up @@ -69,8 +67,6 @@ object JDebPackaging extends AutoPlugin with DebianPluginLike {

// unused, but needed as dependency
val controlDir = targetDir / Names.DebianMaintainerScripts
val _ = debianControlFile.value
val conffile = debianConffilesFile.value
val replacements = debianMakeChownReplacements.value +: linuxScriptReplacements.value

val controlScripts = debianMaintainerScripts.value
Expand Down Expand Up @@ -98,7 +94,9 @@ object JDebPackaging extends AutoPlugin with DebianPluginLike {
debMaker validate ()
debMaker makeDeb ()
debianFile
}
},
packageBin := (packageBin dependsOn debianControlFile).value,
packageBin := (packageBin dependsOn debianConffilesFile).value
)

/**
Expand Down