Merge pull request #68 from bavardage/bd/relativize-symlinks

deepy · web-flow · commit 9b9038b6c884 · 2020-02-20T20:06:49.000+01:00
relativize npm and npx symlinks
diff --git a/src/main/kotlin/com/moowork/gradle/node/task/SetupTask.kt b/src/main/kotlin/com/moowork/gradle/node/task/SetupTask.kt
@@ -85,11 +85,15 @@ open class SetupTask : DefaultTask() {
             // Fix broken symlink
             val npm = Paths.get(variant.nodeBinDir.path, "npm")
             if (Files.deleteIfExists(npm)) {
-                Files.createSymbolicLink(npm, Paths.get(variant.npmScriptFile))
+                Files.createSymbolicLink(
+                        npm,
+                        variant.nodeBinDir.toPath().relativize(Paths.get(variant.npmScriptFile)))
             }
             val npx = Paths.get(variant.nodeBinDir.path, "npx")
             if (Files.deleteIfExists(npx)) {
-                Files.createSymbolicLink(npx, Paths.get(variant.npxScriptFile))
+                Files.createSymbolicLink(
+                        npx,
+                        variant.nodeBinDir.toPath().relativize(Paths.get(variant.npxScriptFile)))
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -85,11 +85,15 @@ open class SetupTask : DefaultTask() {`
`85`	`85`	`// Fix broken symlink`
`86`	`86`	`val npm = Paths.get(variant.nodeBinDir.path, "npm")`
`87`	`87`	`if (Files.deleteIfExists(npm)) {`
`88`		`- Files.createSymbolicLink(npm, Paths.get(variant.npmScriptFile))`
	`88`	`+ Files.createSymbolicLink(`
	`89`	`+ npm,`
	`90`	`+ variant.nodeBinDir.toPath().relativize(Paths.get(variant.npmScriptFile)))`
`89`	`91`	`}`
`90`	`92`	`val npx = Paths.get(variant.nodeBinDir.path, "npx")`
`91`	`93`	`if (Files.deleteIfExists(npx)) {`
`92`		`- Files.createSymbolicLink(npx, Paths.get(variant.npxScriptFile))`
	`94`	`+ Files.createSymbolicLink(`
	`95`	`+ npx,`
	`96`	`+ variant.nodeBinDir.toPath().relativize(Paths.get(variant.npxScriptFile)))`
`93`	`97`	`}`
`94`	`98`	`}`
`95`	`99`	`}`