From 05956c4c7c53e7b825b35ac10e6a05453a51415c Mon Sep 17 00:00:00 2001
From: Wilfred Tyler Gee <wtylergee@gmail.com>
Date: Wed, 20 Nov 2024 09:33:25 -1000
Subject: [PATCH] Updating the script install order.

---
 resources/scripts/install-conda.sh | 3 ---
 resources/scripts/install-pocs.sh  | 4 ++++
 resources/scripts/install.sh       | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/resources/scripts/install-conda.sh b/resources/scripts/install-conda.sh
index d92b0ab30..1367819c5 100644
--- a/resources/scripts/install-conda.sh
+++ b/resources/scripts/install-conda.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 CONDA_URL="https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-$(uname -m).sh"
-CONDA_ENV_NAME=conda-pocs
 PANDIR="${PANDIR:-${HOME}/POCS}"
 
 echo "Installing miniforge conda"
@@ -20,5 +19,3 @@ echo "Creating POCS conda environment"
 
 # Activate by default
 echo "conda activate ${CONDA_ENV_NAME}" >>"${HOME}/.zshrc"
-
-"${HOME}/conda/bin/conda" env update -p "${HOME}/conda/envs/${CONDA_ENV_NAME}" -f "${PANDIR}/environment.yaml"
diff --git a/resources/scripts/install-pocs.sh b/resources/scripts/install-pocs.sh
index 13cab51f4..eb5ebc11f 100644
--- a/resources/scripts/install-pocs.sh
+++ b/resources/scripts/install-pocs.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 CODE_BRANCH=${CODE_BRANCH:-"develop"}
+CONDA_ENV_NAME=conda-pocs
 PANDIR="${PANDIR:-${HOME}/POCS}"
 
 # Check if PANDIR exists and if not, clone.
@@ -14,6 +15,9 @@ else
   cd
 fi
 
+echo "Installing POCS into ${CONDA_ENV_NAME} environment."
+"${HOME}/conda/bin/conda" env update -p "${HOME}/conda/envs/${CONDA_ENV_NAME}" -f "${PANDIR}/environment.yaml"
+
 echo "Creating POCS directories."
 mkdir -p "${HOME}/logs"
 mkdir -p "${HOME}/images"
diff --git a/resources/scripts/install.sh b/resources/scripts/install.sh
index 07dff13d6..b96feeaaa 100644
--- a/resources/scripts/install.sh
+++ b/resources/scripts/install.sh
@@ -12,14 +12,14 @@ source ./fix-time.sh >> install.log 2>&1
 echo "Installing system dependencies."
 source ./install-system-deps.sh >> install.log 2>&1
 
-echo "Installing POCS software."
-source ./install-pocs.sh >> install.log 2>&1
+echo "Installing ZSH for a better shell."
+source ./install-zsh.sh >> install.log 2>&1
 
 echo "Installing conda python."
 source ./install-conda.sh >> install.log 2>&1
 
-echo "Installing ZSH for a better shell."
-source ./install-zsh.sh >> install.log 2>&1
+echo "Installing POCS software."
+source ./install-pocs.sh >> install.log 2>&1
 
 echo "Installing services so things run at startup."
 source ./install-services.sh >> install.log 2>&1