From 75583fee3b1f2a012b8717175cccc891afc8eb66 Mon Sep 17 00:00:00 2001 From: Alexey Kardapoltsev Date: Sat, 16 Aug 2014 14:13:23 +0600 Subject: [PATCH] FIX #322 adding permissions to jdeb packaging --- .../com/typesafe/sbt/packager/debian/JDebPackaging.scala | 7 ++++--- test-project/project/build.properties | 2 +- test-project/src/debian/DEBIAN/postrm | 2 +- test-project/src/debian/DEBIAN/preinst | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/scala/com/typesafe/sbt/packager/debian/JDebPackaging.scala b/src/main/scala/com/typesafe/sbt/packager/debian/JDebPackaging.scala index 634ec96b6..c037fde3b 100644 --- a/src/main/scala/com/typesafe/sbt/packager/debian/JDebPackaging.scala +++ b/src/main/scala/com/typesafe/sbt/packager/debian/JDebPackaging.scala @@ -42,7 +42,6 @@ trait JDebPackaging { this: DebianPlugin with linux.LinuxPlugin => name, version, target, s) => s.log.info("Building debian package with java based implementation 'jdeb'") val console = new JDebConsole(s.log) - val debianFile = target.getParentFile / "%s_%s_all.deb".format(name, version) val debMaker = new DebMaker(console, fileAndDirectoryProducers(mappings, target) ++ linkProducers(symlinks), @@ -68,9 +67,11 @@ trait JDebPackaging { this: DebianPlugin with linux.LinuxPlugin => val (dirs, files) = paths.partition(_._1.isDirectory) paths map { case (path, name) if path.isDirectory => - new DataProducerDirectory(target / name, null, Array("**"), null) + val permMapper = new PermMapper(-1, -1, perms.user, perms.group, null, perms.permissions, -1, null) + new DataProducerDirectory(target / name, null, Array("**"), Array(permMapper)) case (path, name) => - new DataProducerFile(target / name, name, null, null, null) + val permMapper = new PermMapper(-1, -1, perms.user, perms.group, perms.permissions, null, -1, null) + new DataProducerFile(target / name, name, null, null, Array(permMapper)) } }.flatten diff --git a/test-project/project/build.properties b/test-project/project/build.properties index 37b489cb6..be6c454fb 100644 --- a/test-project/project/build.properties +++ b/test-project/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.1 +sbt.version=0.13.5 diff --git a/test-project/src/debian/DEBIAN/postrm b/test-project/src/debian/DEBIAN/postrm index c3f9a749c..fcc4732c2 100644 --- a/test-project/src/debian/DEBIAN/postrm +++ b/test-project/src/debian/DEBIAN/postrm @@ -1 +1 @@ -echo "removed ${{name}}-${{version}} from ${{author}}" +echo "removed ${{app_name}} from ${{author}}" diff --git a/test-project/src/debian/DEBIAN/preinst b/test-project/src/debian/DEBIAN/preinst index 573a3434f..1b7829972 100644 --- a/test-project/src/debian/DEBIAN/preinst +++ b/test-project/src/debian/DEBIAN/preinst @@ -1 +1 @@ -echo "installing ${{name}}-${{version}} from ${{author}}" +echo "installing ${{app_name}} from ${{author}}"