Support specification of micromamba run shell path

And running passing argument other that a shell script.
mamba-org · Dec 6, 2023 · 380f313 · 380f313
1 parent 0f951b3
commit 380f313
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 17 deletions.
diff --git a/dist/cli.js b/dist/cli.js
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/post.js b/dist/post.js
diff --git a/src/main.ts b/src/main.ts
@@ -128,16 +128,16 @@ export const generateMicromambaRunShell = () => {
   }
   core.info('Generating micromamba run shell.')
   const micromambaRunShellContents = `#!/usr/bin/env sh
-chmod +x $1
-$MAMBA_EXE run -r $MAMBA_ROOT_PREFIX -n $MAMBA_DEFAULT_ENV $1
+if test -f "$1"; then chmod +x $1; fi
+$MAMBA_EXE run -r $MAMBA_ROOT_PREFIX -n $MAMBA_DEFAULT_ENV "$@"
 `
   return determineEnvironmentName(options.environmentName, options.environmentFile)
     .then((environmentName) => {
       const file = micromambaRunShellContents
         .replace(/\$MAMBA_EXE/g, options.micromambaBinPath)
         .replace(/\$MAMBA_ROOT_PREFIX/g, options.micromambaRootPath)
         .replace(/\$MAMBA_DEFAULT_ENV/g, environmentName)
-      core.debug(`Writing micromamba run shell to ${options.micromambaRunShellPath}`)
+      core.debug(`Writing micromamba run shell to ${options.micromambaRunShellPatu}`)
       core.debug(`File contents:\n"${file}"`)
       return fs.writeFile(options.micromambaRunShellPath, file, { encoding: 'utf8', mode: 0o755 })
     })

diff --git a/src/options.ts b/src/options.ts
@@ -36,6 +36,7 @@ type Inputs = Readonly<{
   postCleanup?: PostCleanupType
   micromambaRootPath?: string
   micromambaBinPath?: string
+  micromambaRunShellPath?: string
 }>
 
 export type Options = Readonly<{
@@ -154,7 +155,9 @@ const inferOptions = (inputs: Inputs): Options => {
       ? path.resolve(untildify(inputs.condarcFile))
       : path.join(path.dirname(PATHS.micromambaBin), '.condarc'), // next to the micromamba binary -> easier cleanup
     micromambaBinPath,
-    micromambaRunShellPath: path.join(path.dirname(micromambaBinPath), 'micromamba-shell'),
+    micromambaRunShellPath: inputs.micromambaRunShellPath
+      ? path.resolve(untildify(inputs.micromambaRunShellPath))
+      : path.join(path.dirname(micromambaBinPath), 'micromamba-shell'),
     micromambaRootPath: inputs.micromambaRootPath
       ? path.resolve(untildify(inputs.micromambaRootPath))
       : PATHS.micromambaRoot
@@ -252,7 +255,8 @@ const getOptions = () => {
     cacheEnvironmentKey: parseOrUndefined('cache-environment-key', z.string()),
     postCleanup: parseOrUndefined('post-cleanup', postCleanupSchema),
     micromambaRootPath: parseOrUndefined('micromamba-root-path', z.string()),
-    micromambaBinPath: parseOrUndefined('micromamba-binary-path', z.string())
+    micromambaBinPath: parseOrUndefined('micromamba-binary-path', z.string()),
+    micromambaRunShellPath: parseOrUndefined('micromamba-run-shell-path', z.string())
   }
   setLogLevel(inputs.logLevel)
   core.debug(`Inputs: ${JSON.stringify(inputs)}`)