Skip to content

Commit

Permalink
Updating the script install order.
Browse files Browse the repository at this point in the history
  • Loading branch information
wtgee authored Nov 20, 2024
1 parent 5690132 commit 05956c4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
3 changes: 0 additions & 3 deletions resources/scripts/install-conda.sh
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
4 changes: 4 additions & 0 deletions resources/scripts/install-pocs.sh
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions resources/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 05956c4

Please sign in to comment.