Fix exposed INSTALL_DIR_FOR_${toolName} variables

We're missing the /bin
erlef · Jan 28, 2024 · a496e8e · a496e8e
1 parent a145f88
commit a496e8e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -10723,8 +10723,10 @@ async function install(toolName, opts) {
           postExtract: async (cachePath) => {
             const bindir = path.join(cachePath, 'bin')
             const oldPath = path.join(cachePath, 'rebar3')
+            const newPath = path.join(bindir, 'rebar3')
             fs.mkdirSync(bindir)
-            fs.chmodSync(oldPath, 0o755)
+            fs.renameSync(oldPath, newPath)
+            fs.chmodSync(newPath, 0o755)
 
             const ps1Filename = path.join(bindir, 'rebar3.ps1')
             fs.writeFileSync(ps1Filename, `& escript.exe ${oldPath} \${args}`)
@@ -10776,11 +10778,12 @@ async function installTool(opts) {
   await platformOpts.postExtract(cachePath)
 
   core.debug(`Adding ${cachePath}'s bin to system path`)
-  core.addPath(path.join(cachePath, 'bin'))
+  const catchPathBin = path.join(cachePath, 'bin')
+  core.addPath(catchPathBin)
 
   const installDirForVarName = `INSTALL_DIR_FOR_${toolName}`.toUpperCase()
-  core.debug(`Exporting ${installDirForVarName} as ${cachePath}`)
-  core.exportVariable(installDirForVarName, cachePath)
+  core.debug(`Exporting ${installDirForVarName} as ${catchPathBin}`)
+  core.exportVariable(installDirForVarName, catchPathBin)
 
   core.info(`Installed ${installOpts.tool} version`)
   const [cmd, args] = platformOpts.reportVersion()

diff --git a/src/setup-beam.js b/src/setup-beam.js
@@ -903,8 +903,10 @@ async function install(toolName, opts) {
           postExtract: async (cachePath) => {
             const bindir = path.join(cachePath, 'bin')
             const oldPath = path.join(cachePath, 'rebar3')
+            const newPath = path.join(bindir, 'rebar3')
             fs.mkdirSync(bindir)
-            fs.chmodSync(oldPath, 0o755)
+            fs.renameSync(oldPath, newPath)
+            fs.chmodSync(newPath, 0o755)
 
             const ps1Filename = path.join(bindir, 'rebar3.ps1')
             fs.writeFileSync(ps1Filename, `& escript.exe ${oldPath} \${args}`)
@@ -956,11 +958,12 @@ async function installTool(opts) {
   await platformOpts.postExtract(cachePath)
 
   core.debug(`Adding ${cachePath}'s bin to system path`)
-  core.addPath(path.join(cachePath, 'bin'))
+  const catchPathBin = path.join(cachePath, 'bin')
+  core.addPath(catchPathBin)
 
   const installDirForVarName = `INSTALL_DIR_FOR_${toolName}`.toUpperCase()
-  core.debug(`Exporting ${installDirForVarName} as ${cachePath}`)
-  core.exportVariable(installDirForVarName, cachePath)
+  core.debug(`Exporting ${installDirForVarName} as ${catchPathBin}`)
+  core.exportVariable(installDirForVarName, catchPathBin)
 
   core.info(`Installed ${installOpts.tool} version`)
   const [cmd, args] = platformOpts.reportVersion()