fixes #18

solugo · Jan 15, 2019 · 13919bb · 13919bb
1 parent 58065a7
commit 13919bb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 25 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group 'de.solugo.gradle'
-version '0.6.0'
+version '0.6.1'
 
 repositories {
     mavenCentral()

diff --git a/src/main/groovy/de/solugo/gradle/nodejs/NodeJsTask.groovy b/src/main/groovy/de/solugo/gradle/nodejs/NodeJsTask.groovy
@@ -1,10 +1,6 @@
 package de.solugo.gradle.nodejs
 
 import org.apache.tools.ant.taskdefs.condition.Os
-import org.gradle.api.internal.file.archive.compression.AbstractArchiver
-import org.gradle.api.resources.MissingResourceException
-import org.gradle.api.resources.ReadableResource
-import org.gradle.api.resources.ResourceException
 import org.gradle.api.tasks.AbstractExecTask
 import org.gradle.api.tasks.Input
 
@@ -89,22 +85,17 @@ class NodeJsTask<T extends NodeJsTask<T>> extends AbstractExecTask<T> {
             name = command
         }
 
-        final File absoluteFile = new File(name);
-        if (absoluteFile.exists()) {
-            return absoluteFile
-        }
-
-        final File globalFile = new File(nodeJsUtil.bin, name)
-        if (globalFile.exists()) {
-            return globalFile
-        }
+        final File[] files = [
+                new File(nodeJsUtil.bin, name),
+                new File(this.joinPaths(this.project.nodejs.rootPath, "node_modules", ".bin", name)),
+                new File(name)
+        ]
 
-        final File localFile = new File(this.joinPaths(this.project.nodejs.rootPath, "node_modules", ".bin", name))
-        if (localFile.exists()) {
-            return localFile
+        for (File file : files){
+            if (file.exists()) return file
         }
 
-        return null
+        throw new RuntimeException("Could not find '$command' at $files")
     }
 
     protected File resolveModule(final NodeJsUtil nodeJsUtil, final String module) {

diff --git a/src/main/groovy/de/solugo/gradle/nodejs/NodeJsUtil.groovy b/src/main/groovy/de/solugo/gradle/nodejs/NodeJsUtil.groovy
@@ -1,13 +1,9 @@
 package de.solugo.gradle.nodejs
 
-
 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.StandardCopyOption
-
 class NodeJsUtil {
 
     static synchronized NodeJsUtil getInstance(Project project, String version) {
@@ -49,7 +45,7 @@ class NodeJsUtil {
             throw new UnsupportedOperationException("Architecture not supported")
         }
 
-        if (!target.exists()) {
+        if (!target.exists() || target.listFiles().size() == 0) {
             final root = "node-v${version}-${platform}-${arch}"
             final file = "${root}.${ext}"
             final downloadFile = new File(cache, file)
@@ -79,9 +75,10 @@ class NodeJsUtil {
 
                 tree.visit { source ->
                     final name = source.relativePath.pathString
-                    final int start = name.indexOf(File.separator)
+                    final int start = name.indexOf("/")
+
                     if (start != -1) {
-                        final destination = new File(target, name.substring(name.indexOf(File.separator)))
+                        final destination = new File(target, name.substring(start + 1))
                         if (source.isDirectory()) {
                             destination.mkdirs()
                         } else {