Fix root prefix init (#107)

mamba-org · Jul 23, 2023 · 0aaa0e4 · 0aaa0e4
1 parent 5b9dc5c
commit 0aaa0e4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -48,9 +48,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ./
         with:
-          micromamba-version: 1.2.0-1
+          micromamba-version: 1.4.5-0
           environment-file: 'test/environment.yml'
-      - run: test "$(micromamba --version)" = 1.2.0
+      - run: test "$(micromamba --version)" = 1.4.5
         shell: bash -el {0}
 
   micromamba-shell:

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/post.js b/dist/post.js
diff --git a/src/shell-init.ts b/src/shell-init.ts
@@ -39,8 +39,7 @@ const removeMambaInitBlockFromBashProfile = () => {
 export const shellInit = (shell: string) => {
   core.startGroup(`Initialize micromamba for ${shell}.`)
   const command = execute(
-    // it should be -r instead of -p, see https://github.com/mamba-org/mamba/issues/2442
-    micromambaCmd(`shell init -s ${shell} -p ${options.micromambaRootPath}`, options.logLevel, options.condarcFile)
+    micromambaCmd(`shell init -s ${shell} -r ${options.micromambaRootPath}`, options.logLevel, options.condarcFile)
   )
   if (os.platform() === 'linux' && shell === 'bash') {
     return command.then(copyMambaInitBlockToBashProfile).finally(core.endGroup)
@@ -51,8 +50,7 @@ export const shellInit = (shell: string) => {
 export const shellDeinit = (shell: string) => {
   core.startGroup(`Deinitialize micromamba for ${shell}`)
   const command = execute(
-    // it should be -r instead of -p, see https://github.com/mamba-org/mamba/issues/2442
-    micromambaCmd(`shell deinit -s ${shell} -p ${options.micromambaRootPath}`, options.logLevel, options.condarcFile)
+    micromambaCmd(`shell deinit -s ${shell} -r ${options.micromambaRootPath}`, options.logLevel, options.condarcFile)
   )
   if (os.platform() === 'linux' && shell === 'bash') {
     return command.then(removeMambaInitBlockFromBashProfile).finally(core.endGroup)