fix: remove trailing forward slash when resolving workspace root link in runfiles MANIFEST (#3093)

gregmagolan · alexeagle · commit bcff2179005d · 2021-12-02T16:25:42.000-08:00
diff --git a/internal/linker/index.js b/internal/linker/index.js
@@ -416,7 +416,7 @@ function main(args, runfiles) {
                             runfilesPath = runfilesPath.slice(externalPrefix.length);
                         }
                         else {
-                            runfilesPath = `${workspace}/${runfilesPath}`;
+                            runfilesPath = path.posix.join(workspace, runfilesPath);
                         }
                         try {
                             target = runfiles.resolve(runfilesPath);
diff --git a/internal/linker/link_node_modules.ts b/internal/linker/link_node_modules.ts
@@ -623,7 +623,7 @@ export async function main(args: string[], runfiles: Runfiles) {
         if (runfilesPath.startsWith(externalPrefix)) {
           runfilesPath = runfilesPath.slice(externalPrefix.length);
         } else {
-          runfilesPath = `${workspace}/${runfilesPath}`;
+          runfilesPath = path.posix.join(workspace, runfilesPath);
         }
         try {
           target = runfiles.resolve(runfilesPath);

Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,7 @@ function main(args, runfiles) {`
`416`	`416`	`runfilesPath = runfilesPath.slice(externalPrefix.length);`
`417`	`417`	`}`
`418`	`418`	`else {`
`419`		- runfilesPath = `${workspace}/${runfilesPath}`;
	`419`	`+ runfilesPath = path.posix.join(workspace, runfilesPath);`
`420`	`420`	`}`
`421`	`421`	`try {`
`422`	`422`	`target = runfiles.resolve(runfilesPath);`
Original file line number	Diff line number	Diff line change
`@@ -623,7 +623,7 @@ export async function main(args: string[], runfiles: Runfiles) {`
`623`	`623`	`if (runfilesPath.startsWith(externalPrefix)) {`
`624`	`624`	`runfilesPath = runfilesPath.slice(externalPrefix.length);`
`625`	`625`	`} else {`
`626`		- runfilesPath = `${workspace}/${runfilesPath}`;
	`626`	`+ runfilesPath = path.posix.join(workspace, runfilesPath);`
`627`	`627`	`}`
`628`	`628`	`try {`
`629`	`629`	`target = runfiles.resolve(runfilesPath);`