use basename

conda-incubator · Oct 1, 2024 · 16f2ab5 · 16f2ab5
1 parent c773066
commit 16f2ab5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/example-6.yml b/.github/workflows/example-6.yml
@@ -24,7 +24,9 @@ jobs:
     if:
       (github.event_name == 'schedule' && github.repository ==
       'conda-incubator/setup-miniconda') || (github.event_name != 'schedule')
-    name: Ex6 (${{ matrix.os }})
+    name:
+      Ex6 (${{ matrix.os }}, mamba ${{ matrix.mamba-version }}, ${{
+      matrix.activate-environment }})
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false

diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -47062,9 +47062,11 @@ exports.updateMamba = {
     }),
     postInstall: (inputs, options) => __awaiter(void 0, void 0, void 0, function* () {
         const mambaBat = conda.condaExecutable(options).replace(/\\/g, "/");
-        if (!mambaBat.includes("condabin")) {
-            const condabinLocation = path.join(conda.condaBasePath(options), "condabin", `mamba${constants.IS_WINDOWS ? ".bat" : ""}`);
+        const parentDirName = path.basename(path.dirname(mambaBat));
+        if (parentDirName !== "condabin") {
+            const condabinLocation = path.join(conda.condaBasePath(options), "condabin", path.basename(mambaBat));
             if (!fs.existsSync(condabinLocation)) {
+                core.info(`Copying ${mambaBat} to ${condabinLocation}...`);
                 fs.copyFileSync(mambaBat, condabinLocation);
             }
         }

diff --git a/src/base-tools/update-mamba.ts b/src/base-tools/update-mamba.ts
@@ -25,13 +25,15 @@ export const updateMamba: types.IToolProvider = {
   },
   postInstall: async (inputs, options) => {
     const mambaBat = conda.condaExecutable(options).replace(/\\/g, "/");
-    if (!mambaBat.includes("condabin")) {
+    const parentDirName = path.basename(path.dirname(mambaBat));
+    if (parentDirName !== "condabin") {
       const condabinLocation = path.join(
         conda.condaBasePath(options),
         "condabin",
-        `mamba${constants.IS_WINDOWS ? ".bat" : ""}`,
+        path.basename(mambaBat),
       );
       if (!fs.existsSync(condabinLocation)) {
+        core.info(`Copying ${mambaBat} to ${condabinLocation}...`);
         fs.copyFileSync(mambaBat, condabinLocation);
       }
     }