Use platform-appropriate path separator

KyleMayes · Apr 6, 2021 · 4609a7b · 4609a7b
1 parent a89d539
commit 4609a7b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -5081,7 +5081,7 @@ function install(options) {
 }
 function run(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var bin, lib;
+        var bin, lib, ld, dyld;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -5096,8 +5096,10 @@ function run(options) {
                     bin = path.resolve(path.join(options.directory, "bin"));
                     lib = path.resolve(path.join(options.directory, "lib"));
                     core.addPath(bin);
-                    core.exportVariable("LD_LIBRARY_PATH", lib + ":" + (process.env.LD_LIBRARY_PATH || ""));
-                    core.exportVariable("DYLD_LIBRARY_PATH", lib + ":" + (process.env.DYLD_LIBRARY_PATH || ""));
+                    ld = process.env.LD_LIBRARY_PATH;
+                    dyld = process.env.DYLD_LIBRARY_PATH;
+                    core.exportVariable("LD_LIBRARY_PATH", "" + lib + path.delimiter + ld);
+                    core.exportVariable("DYLD_LIBRARY_PATH", "" + lib + path.delimiter + dyld);
                     return [2 /*return*/];
             }
         });

diff --git a/index.ts b/index.ts
@@ -280,9 +280,14 @@ async function run(options: Options): Promise<void> {
 
   const bin = path.resolve(path.join(options.directory, "bin"));
   const lib = path.resolve(path.join(options.directory, "lib"));
+
   core.addPath(bin);
-  core.exportVariable("LD_LIBRARY_PATH", `${lib}:${process.env.LD_LIBRARY_PATH || ""}`);
-  core.exportVariable("DYLD_LIBRARY_PATH", `${lib}:${process.env.DYLD_LIBRARY_PATH || ""}`);
+
+  const ld = process.env.LD_LIBRARY_PATH;
+  const dyld = process.env.DYLD_LIBRARY_PATH;
+
+  core.exportVariable("LD_LIBRARY_PATH", `${lib}${path.delimiter}${ld}`);
+  core.exportVariable("DYLD_LIBRARY_PATH", `${lib}${path.delimiter}${dyld}`);
 }
 
 async function test(platform: string, options: Options): Promise<void> {