From 00f551b2d16e1ecda99eeab266b169ee0215875b Mon Sep 17 00:00:00 2001
From: Sergey Dolin <dsame@github.com>
Date: Mon, 17 Jul 2023 14:42:22 +0200
Subject: [PATCH] rename lnkSrc

---
 dist/setup/index.js | 18 +++++++++++-------
 src/installer.ts    | 20 +++++++++++++-------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/dist/setup/index.js b/dist/setup/index.js
index 6783029..37158af 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -61468,8 +61468,12 @@ function installGoVersion(info, auth, arch) {
         // by avoiding write operations to C:
         const isHosted = process.env['RUNNER_ENVIRONMENT'] === 'github-hosted' ||
             process.env['AGENT_ISSELFHOSTED'] === '0';
-        if (isWindows && isHosted && fs_1.default.existsSync('d:\\') && fs_1.default.existsSync('c:\\')) {
-            const defaultToolCacheRoot = process.env['RUNNER_TOOL_CACHE'] || '';
+        const defaultToolCacheRoot = process.env['RUNNER_TOOL_CACHE'];
+        if (isWindows &&
+            defaultToolCacheRoot &&
+            isHosted &&
+            fs_1.default.existsSync('d:\\') &&
+            fs_1.default.existsSync('c:\\')) {
             const substitutedToolCacheRoot = defaultToolCacheRoot
                 .replace('C:', 'D:')
                 .replace('c:', 'd:');
@@ -61477,14 +61481,14 @@ function installGoVersion(info, auth, arch) {
             process.env['RUNNER_TOOL_CACHE'] = substitutedToolCacheRoot;
             const actualToolCacheDir = yield addExecutablesToCache(extPath, info, arch);
             // create a link from c: to d:
-            const lnkSrc = actualToolCacheDir.replace(substitutedToolCacheRoot, defaultToolCacheRoot);
-            fs_1.default.mkdirSync(path.dirname(lnkSrc), { recursive: true });
-            fs_1.default.symlinkSync(actualToolCacheDir, lnkSrc, 'junction');
-            core.info(`Created link ${lnkSrc} => ${actualToolCacheDir}`);
+            const defaultToolCacheDir = actualToolCacheDir.replace(substitutedToolCacheRoot, defaultToolCacheRoot);
+            fs_1.default.mkdirSync(path.dirname(defaultToolCacheDir), { recursive: true });
+            fs_1.default.symlinkSync(actualToolCacheDir, defaultToolCacheDir, 'junction');
+            core.info(`Created link ${defaultToolCacheDir} => ${actualToolCacheDir}`);
             // restore toolcache root to default drive c:
             process.env['RUNNER_TOOL_CACHE'] = defaultToolCacheRoot;
             // make outer code to continue using toolcache as if it were installed on c:
-            return lnkSrc;
+            return defaultToolCacheDir;
         }
         return yield addExecutablesToCache(extPath, info, arch);
     });
diff --git a/src/installer.ts b/src/installer.ts
index 7fc70b8..629d696 100644
--- a/src/installer.ts
+++ b/src/installer.ts
@@ -206,8 +206,14 @@ async function installGoVersion(
   const isHosted =
     process.env['RUNNER_ENVIRONMENT'] === 'github-hosted' ||
     process.env['AGENT_ISSELFHOSTED'] === '0';
-  if (isWindows && isHosted && fs.existsSync('d:\\') && fs.existsSync('c:\\')) {
-    const defaultToolCacheRoot = process.env['RUNNER_TOOL_CACHE'] || '';
+  const defaultToolCacheRoot = process.env['RUNNER_TOOL_CACHE'];
+  if (
+    isWindows &&
+    defaultToolCacheRoot &&
+    isHosted &&
+    fs.existsSync('d:\\') &&
+    fs.existsSync('c:\\')
+  ) {
     const substitutedToolCacheRoot = defaultToolCacheRoot
       .replace('C:', 'D:')
       .replace('c:', 'd:');
@@ -217,19 +223,19 @@ async function installGoVersion(
     const actualToolCacheDir = await addExecutablesToCache(extPath, info, arch);
 
     // create a link from c: to d:
-    const lnkSrc = actualToolCacheDir.replace(
+    const defaultToolCacheDir = actualToolCacheDir.replace(
       substitutedToolCacheRoot,
       defaultToolCacheRoot
     );
-    fs.mkdirSync(path.dirname(lnkSrc), {recursive: true});
-    fs.symlinkSync(actualToolCacheDir, lnkSrc, 'junction');
-    core.info(`Created link ${lnkSrc} => ${actualToolCacheDir}`);
+    fs.mkdirSync(path.dirname(defaultToolCacheDir), {recursive: true});
+    fs.symlinkSync(actualToolCacheDir, defaultToolCacheDir, 'junction');
+    core.info(`Created link ${defaultToolCacheDir} => ${actualToolCacheDir}`);
 
     // restore toolcache root to default drive c:
     process.env['RUNNER_TOOL_CACHE'] = defaultToolCacheRoot;
 
     // make outer code to continue using toolcache as if it were installed on c:
-    return lnkSrc;
+    return defaultToolCacheDir;
   }
 
   return await addExecutablesToCache(extPath, info, arch);