Default to miniforge

Signed-off-by: Andy Neff <andy@visionsystemsinc.com>
VisionSystemsInc · Nov 9, 2023 · 3bd3830 · 3bd3830
1 parent 4e06919
commit 3bd3830
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/docker/recipes b/docker/recipes
diff --git a/linux/just_files/just_install_functions.bsh b/linux/just_files/just_install_functions.bsh
@@ -172,7 +172,7 @@ function cmake-install()
 # :Arguments: * [``--dir {dir}``] - conda install directory
 #             * [``--version {version}``] - conda version for install (default= ``${CONDA_VERSION:-latest}``)
 #             * [``--installer {INSTALLER}``] - Conda installer (default= ``${CONDA_INSTALLER:-}``)
-#             * [``--miniforge``] - Use miniforge installer (rather than miniconda)
+#             * [``--miniconda``] - Use miniconda installer (rather than miniforge)
 #
 # :Output: * conda_exe - conda executable
 #          * conda_version - conda version
@@ -185,13 +185,13 @@ function conda-install()
   local conda_dir  # install directory
   local conda_ver="${CONDA_VERSION:-latest}"  # conda version
   local CONDA_INSTALLER="${CONDA_INSTALLER:-}"  # optional conda installer
-  local download_miniforge=0  # use miniforge (rather than miniconda)
+  local download_miniconda=0  # use miniconda (rather than miniforge)
 
   parse_args conda_extra_args \
       --dir conda_dir: \
       --version conda_ver: \
       --installer CONDA_INSTALLER: \
-      --miniforge download_miniforge \
+      --miniconda download_miniconda \
       -- ${@+"${@}"}
 
   # directory check
@@ -204,9 +204,8 @@ function conda-install()
   # download conda installer to self-deleting temporary directory
   if [ -z "${CONDA_INSTALLER-}" ]; then
 
-    # miniforge url
-    if [ "${download_miniforge}" != "0" ]; then
-
+    if [ "${download_miniconda}" = "0" ]; then
+      # miniforge url
       local conda_url="https://github.com/conda-forge/miniforge/releases/"
       local conda_ver_str
       if [ "${conda_ver}" == "latest" ]; then

diff --git a/tests/int/test-just_install_functions.bsh b/tests/int/test-just_install_functions.bsh
@@ -89,8 +89,8 @@ CONDA_TEST_ID_ARRAY=(
     "miniforge"
 )
 CONDA_EXTRA_ARGS_ARRAY=(
-    "--version py38_4.10.3"
-    "--miniforge --version 4.11.0-4"
+    "--miniconda --version py38_4.10.3"
+    "--version 4.11.0-4"
 )
 CONDA_VER_FULL_ARRAY=(
     "conda 4.10.3"