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

#89: Implemented packArchivePosixMask mechanism #90

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

#89: Implemented packArchivePosixMask mechanism #90

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
014a69f
Added option that exposes a function to assign a posix mask to an
Sep 24, 2015
3444aa9
Restored default behaviour when packArchivePosixMask := is not specified
Sep 24, 2015
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
40 changes: 34 additions & 6 deletions src/main/scala/xerial/sbt/PackArchive.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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))
Expand All @@ -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)
Expand All @@ -56,10 +59,33 @@ 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] =
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function is not used.

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

def posixMaskFromBinPath(distDir: File): File => Option[Int] = {
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
}

Expand All @@ -78,6 +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(Pack.packTargetDir.value / Pack.packDir.value),

packArchiveTgz := createArchive("tar.gz",
(fos) => createTarArchiveOutputStream(new GzipCompressorOutputStream(fos)),
createTarEntry).value,
Expand Down