From 014a69f2053a430dd54c4232ab8dc7cb4f199260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicola=20Orr=C3=B9?= Date: Thu, 24 Sep 2015 18:28:51 +0100 Subject: [PATCH 1/2] Added option that exposes a function to assign a posix mask to an archived file --- src/main/scala/xerial/sbt/PackArchive.scala | 40 +++++++++++++++++---- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/src/main/scala/xerial/sbt/PackArchive.scala b/src/main/scala/xerial/sbt/PackArchive.scala index 74259cd8..1def04d4 100644 --- a/src/main/scala/xerial/sbt/PackArchive.scala +++ b/src/main/scala/xerial/sbt/PackArchive.scala @@ -10,11 +10,14 @@ import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream import org.apache.commons.compress.utils.IOUtils +import java.nio.file.Files +import scala.collection.JavaConversions._ trait PackArchive { val packArchivePrefix = SettingKey[String]("prefix of (prefix)-(version).(format) archive file name") val packArchiveName = SettingKey[String]("archive file name. Default is (project-name)-(version)") val packArchiveExcludes = SettingKey[Seq[String]]("List of excluding files from the archive") + val packArchivePosixMask = SettingKey[File => Option[Int]]("Function that associates an archive mask with a given path") val packArchiveTgzArtifact = SettingKey[Artifact]("tar.gz archive artifact") val packArchiveTbzArtifact = SettingKey[Artifact]("tar.bz2 archive artifact") val packArchiveTxzArtifact = SettingKey[Artifact]("tar.xz archive artifact") @@ -28,11 +31,11 @@ trait PackArchive { private def createArchive( archiveSuffix: String, createOutputStream: (OutputStream) => ArchiveOutputStream, - createEntry: (File, String, File) => ArchiveEntry) = Def.task { + createEntry: (File, String, File => Option[Int]) => ArchiveEntry) = Def.task { + val posixMaskFunction = packArchivePosixMask.value val out = streams.value val targetDir: File = Pack.packTargetDir.value val distDir: File = Pack.pack.value // run pack command here - val binDir = distDir / "bin" val archiveStem = s"${packArchiveName.value}" val archiveName = s"${archiveStem}.${archiveSuffix}" out.log.info("Generating " + rpath(baseDirectory.value, targetDir / archiveName)) @@ -42,7 +45,7 @@ trait PackArchive { .getOrElse(Array.empty) .filterNot(f => excludeFiles.contains(rpath(distDir, f))) .foreach { file => - aos.putArchiveEntry(createEntry(file, archiveStem ++ "/" ++ rpath(distDir, file, "/"), binDir)) + aos.putArchiveEntry(createEntry(file, archiveStem ++ "/" ++ rpath(distDir, file, "/"), posixMaskFunction)) if (file.isDirectory) { aos.closeArchiveEntry() addFilesToArchive(file) @@ -56,10 +59,34 @@ trait PackArchive { targetDir / archiveName } - private def createTarEntry(file: File, fileName: String, binDir: File) = { - val archiveEntry = new TarArchiveEntry(file, fileName) + def posixMaskFromFilesystem(file: File): Option[Int] = { + val perms = Files.getPosixFilePermissions(file.toPath) + val mask = perms.foldLeft(0) { (a, b) => a | (0x100 >> b.ordinal) } + //println(s"Octal mask for ${file} is 0${mask.toOctalString}") + Some(mask) + } + + def posixMaskNone(_unused: File): Option[Int] = + None + + def posixMaskFromPath(binDir: File)(file: File): Option[Int] = if (file.getAbsolutePath startsWith binDir.getAbsolutePath) - archiveEntry.setMode(Integer.parseInt("0755", 8)) + Some(Integer.parseInt("0755", 8)) + else + None + + val posixMaskFromBinPath: File => Option[Int] = { + val distDir: File = Pack.pack.value + val binDir = distDir / "bin" + posixMaskFromPath(binDir) _ + } + + private def createTarEntry( + file: File, + fileName: String, + posixMask: File => Option[Int]) = { + val archiveEntry = new TarArchiveEntry(file, fileName) + posixMask(file) foreach { archiveEntry.setMode(_) } archiveEntry } @@ -78,6 +105,7 @@ trait PackArchive { packArchiveTbzArtifact := Artifact(packArchivePrefix.value, "arch", "tar.bz2"), packArchiveTxzArtifact := Artifact(packArchivePrefix.value, "arch", "tar.xz"), packArchiveZipArtifact := Artifact(packArchivePrefix.value, "arch", "zip"), + packArchivePosixMask := posixMaskFromBinPath, packArchiveTgz := createArchive("tar.gz", (fos) => createTarArchiveOutputStream(new GzipCompressorOutputStream(fos)), createTarEntry).value, From 3444aa94259f22b5ba01fc5d517b43c3822591ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicola=20Orr=C3=B9?= Date: Thu, 24 Sep 2015 19:08:00 +0100 Subject: [PATCH 2/2] Restored default behaviour when packArchivePosixMask := is not specified --- src/main/scala/xerial/sbt/PackArchive.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/scala/xerial/sbt/PackArchive.scala b/src/main/scala/xerial/sbt/PackArchive.scala index 1def04d4..a4a08924 100644 --- a/src/main/scala/xerial/sbt/PackArchive.scala +++ b/src/main/scala/xerial/sbt/PackArchive.scala @@ -75,8 +75,7 @@ trait PackArchive { else None - val posixMaskFromBinPath: File => Option[Int] = { - val distDir: File = Pack.pack.value + def posixMaskFromBinPath(distDir: File): File => Option[Int] = { val binDir = distDir / "bin" posixMaskFromPath(binDir) _ } @@ -105,7 +104,8 @@ trait PackArchive { packArchiveTbzArtifact := Artifact(packArchivePrefix.value, "arch", "tar.bz2"), packArchiveTxzArtifact := Artifact(packArchivePrefix.value, "arch", "tar.xz"), packArchiveZipArtifact := Artifact(packArchivePrefix.value, "arch", "zip"), - packArchivePosixMask := posixMaskFromBinPath, + packArchivePosixMask := posixMaskFromBinPath(Pack.packTargetDir.value / Pack.packDir.value), + packArchiveTgz := createArchive("tar.gz", (fos) => createTarArchiveOutputStream(new GzipCompressorOutputStream(fos)), createTarEntry).value,