Merge pull request #299 from isuruf/condaBasePath

conda-incubator · Nov 26, 2023 · d1e04fc · d1e04fc
2 parents fab0073 + fa6bdf9
commit d1e04fc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -47248,14 +47248,12 @@ const utils = __importStar(__nccwpck_require__(1314));
  * Provide current location of miniconda or location where it will be installed
  */
 function condaBasePath(options) {
-    let condaPath = constants.MINICONDA_DIR_PATH;
-    if (!options.useBundled) {
-        if (constants.IS_MAC) {
-            condaPath = "/Users/runner/miniconda3";
-        }
-        else {
-            condaPath += "3";
-        }
+    let condaPath;
+    if (options.useBundled) {
+        condaPath = constants.MINICONDA_DIR_PATH;
+    }
+    else {
+        condaPath = path.join(os.homedir(), "miniconda3");
     }
     return condaPath;
 }

diff --git a/src/conda.ts b/src/conda.ts
@@ -17,13 +17,11 @@ import * as utils from "./utils";
  * Provide current location of miniconda or location where it will be installed
  */
 export function condaBasePath(options: types.IDynamicOptions): string {
-  let condaPath: string = constants.MINICONDA_DIR_PATH;
-  if (!options.useBundled) {
-    if (constants.IS_MAC) {
-      condaPath = "/Users/runner/miniconda3";
-    } else {
-      condaPath += "3";
-    }
+  let condaPath: string;
+  if (options.useBundled) {
+    condaPath = constants.MINICONDA_DIR_PATH;
+  } else {
+    condaPath = path.join(os.homedir(), "miniconda3");
   }
   return condaPath;
 }