Skip to content

Commit cc8f726

Browse files
committed
Merge pull request #122 from hindsightsoftware/lintian-cleanup
Cleaning up Lintian errors and warnings
2 parents 55aaf03 + facd5e3 commit cc8f726

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/main/scala/com/typesafe/sbt/packager/GenericPackageSettings.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ trait GenericPackageSettings
8888
if !file.isDirectory
8989
if name startsWith "bin/"
9090
if !(name endsWith ".bat") // IGNORE windows-y things.
91-
} yield LinuxSymlink("/usr/" + name, installLocation+"/"+pkg+"/"+name)
91+
} yield LinuxSymlink("/usr/" + name, installLocation.stripPrefix("/usr/")+"/"+pkg+"/"+name)
9292
},
9393
// Map configuration files
9494
linuxPackageSymlinks <++= (normalizedName in Universal, mappings in Universal, defaultLinuxInstallLocation) map { (pkg, mappings, installLocation) =>

src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ object JavaServerAppPackaging {
7070
}
7171
for {
7272
s <- script.toSeq
73-
} yield LinuxPackageMapping(Seq(s -> path)).withPerms(permissions)
73+
} yield LinuxPackageMapping(Seq(s -> path)).withPerms(permissions).withConfig()
7474
},
7575
// TODO should we specify daemonGroup in configs?
7676
linuxPackageMappings in Debian <+= (normalizedName, defaultLinuxLogsLocation, target in Debian, daemonUser in Debian) map {

0 commit comments

Comments
 (0)