fixed minor mamba command issue

Aquaveo · Jan 17, 2024 · 046c015 · 046c015
1 parent 455f665
commit 046c015
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/tethysapp/app_store/model.py b/tethysapp/app_store/model.py
@@ -1 +0,0 @@
-print("dam_inventory installed in dev mode")

diff --git a/tethysapp/app_store/scripts/conda_install.sh b/tethysapp/app_store/scripts/conda_install.sh
@@ -1,7 +1,11 @@
 #!/bin/bash
 
 echo "Running Mamba Install"
-# mamba install -y --freeze-installed -q -c $2 -c tethysplatform -c conda-forge $1
-micromamba install -y --freeze-installed -q -c $2 -c tethysplatform -c conda-forge $1
+if micromamba; then
+    MAMBA_COMMAND=micromamba
+else
+    MAMBA_COMMAND=mamba
 
-echo "Mamba Install Complete"
+$MAMBA_COMMAND install -y --freeze-installed -q -c $2 -c tethysplatform -c conda-forge $1
+
+echo "Mamba Install Complete"
diff --git a/tethysapp/app_store/scripts/mamba_uninstall.sh b/tethysapp/app_store/scripts/mamba_uninstall.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
 echo "Running Mamba remove"
-micromamba remove -y --force $1
+if micromamba; then
+    MAMBA_COMMAND=micromamba
+else
+    MAMBA_COMMAND=mamba
+
+$MAMBA_COMMAND remove -y --force $1
 echo "Mamba Remove Complete"
diff --git a/tethysapp/app_store/scripts/mamba_update.sh b/tethysapp/app_store/scripts/mamba_update.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
 echo "Running Mamba Update"
-micromamba install -y  -q -c $2 -c tethysplatform -c conda-forge $1
+if micromamba; then
+    MAMBA_COMMAND=micromamba
+else
+    MAMBA_COMMAND=mamba
+
+$MAMBA_COMMAND install -y  -q -c $2 -c tethysplatform -c conda-forge $1
 echo "Mamba Update Complete"