fixes tar extraction on posix systems

solugo · Feb 21, 2019 · 254ef63 · 254ef63
1 parent 76afcee
commit 254ef63
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group 'de.solugo.gradle'
-version '0.6.1'
+version '0.6.2'
 
 repositories {
     mavenCentral()
@@ -15,7 +15,8 @@ repositories {
 dependencies {
     compile gradleApi()
     compile localGroovy()
-    compile "org.tukaani:xz:1.8"
+    compile "org.apache.commons:commons-compress:1.18"
+
 
     testCompile gradleTestKit()
     testCompile "junit:junit:4.12"

diff --git a/src/main/groovy/de/solugo/gradle/nodejs/NodeJsUtil.groovy b/src/main/groovy/de/solugo/gradle/nodejs/NodeJsUtil.groovy
@@ -1,9 +1,23 @@
 package de.solugo.gradle.nodejs
 
+import org.apache.commons.compress.archivers.ArchiveEntry
+import org.apache.commons.compress.archivers.ArchiveInputStream
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream
+import org.apache.commons.compress.archivers.tar.TarConstants
+import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream
+import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream
+import org.apache.commons.compress.utils.IOUtils
 import org.apache.tools.ant.taskdefs.condition.Os
 import org.gradle.api.Project
 import org.gradle.api.file.FileTree
 
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.nio.file.attribute.PosixFilePermission
+import java.nio.file.attribute.PosixFilePermissions
+import java.util.zip.ZipEntry
+
 class NodeJsUtil {
 
     static synchronized NodeJsUtil getInstance(Project project, String version) {
@@ -64,28 +78,56 @@ class NodeJsUtil {
 
                 target.mkdirs()
 
-                final FileTree tree
+                final ArchiveInputStream inputStream
                 if (ext == "tar.gz") {
-                    tree = project.tarTree(downloadFile)
+                    inputStream = new TarArchiveInputStream(new GzipCompressorInputStream(new FileInputStream(downloadFile)));
                 } else if (ext == "zip") {
-                    tree = project.zipTree(downloadFile)
+                    inputStream = new ZipArchiveInputStream(new FileInputStream(downloadFile))
                 } else {
                     throw new UnsupportedOperationException("Archive ${downloadFile.name} not supported")
                 }
 
-                tree.visit { source ->
-                    final name = source.relativePath.pathString
+                ArchiveEntry entry = inputStream.nextEntry
+                while (entry != null) {
+                    final name = entry.name
                     final int start = name.indexOf("/")
 
                     if (start != -1) {
                         final destination = new File(target, name.substring(start + 1))
-                        if (source.isDirectory()) {
+                        if (entry.isDirectory()) {
                             destination.mkdirs()
                         } else {
-                            source.copyTo(destination)
+                            if (entry instanceof TarArchiveEntry) {
+
+                                if (entry.isSymbolicLink()) {
+                                    Files.createSymbolicLink(
+                                            destination.toPath(),
+                                            Paths.get(entry.linkName)
+                                    )
+                                } else {
+                                    destination.withDataOutputStream {
+                                        IOUtils.copy(inputStream, it)
+                                    }
+                                }
+
+                                final ownerValue = "$entry.mode".substring(0,1).toInteger()
+                                destination.setExecutable((ownerValue & 1) == 1)
+                                destination.setWritable((ownerValue & 2) == 2)
+                                destination.setReadable((ownerValue & 4) == 4)
+
+                            } else {
+
+                                destination.withDataOutputStream {
+                                    IOUtils.copy(inputStream, it)
+                                }
+
+                            }
                         }
                     }
+
+                    entry = inputStream.nextEntry
                 }
+
             } catch (final Throwable throwable) {
                 target.delete()
                 throw throwable