restore bash forwarder

conda-incubator · Oct 3, 2024 · f2345f7 · f2345f7
1 parent 24ed97e
commit f2345f7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/dist/setup/index.js b/dist/setup/index.js
diff --git a/src/base-tools/update-mamba.ts b/src/base-tools/update-mamba.ts
@@ -38,8 +38,12 @@ export const updateMamba: types.IToolProvider = {
         fs.symlinkSync(mambaExec, condabinLocation);
       }
     } else {
-      core.info(`Creating .bat wrapper for 'mamba 2.x'...`);
+      core.info(`Creating bash wrapper for 'mamba'...`);
       const mambaBat = condabinLocation.slice(0, -4) + ".bat";
+      // Add bat-less forwarder for bash users on Windows
+      const forwarderContents = `cmd.exe /C CALL "${mambaBat}" $* || exit 1`;
+      fs.writeFileSync(condabinLocation.slice(0, -4), forwarderContents);
+      core.info(`... wrote ${mambaExec.slice(0, -4)}:\n${forwarderContents}`);
       if (!fs.existsSync(mambaBat)) {
         // This is Windows and mamba 2.x, we need a mamba.bat like 1.x used to have
         const contents = `
@@ -69,7 +73,7 @@ export const updateMamba: types.IToolProvider = {
 @IF [%1]==[uninstall] "%~dp0_conda_activate" reactivate
 
 @EXIT /B %errorlevel%`;
-        core.info(`Creating BAT wrapper for 'mamba 2.x'...`);
+        core.info(`Creating .bat wrapper for 'mamba 2.x'...`);
         fs.writeFileSync(mambaBat, contents);
         core.info(`... wrote ${mambaBat}`);
       }