From 7fa099f8bdb92a3f37ea90eccfcc6574a6636241 Mon Sep 17 00:00:00 2001
From: Kauna <16511995+klei22@users.noreply.github.com>
Date: Mon, 20 Oct 2025 11:30:20 -0700
Subject: [PATCH] Improve one-shot dev environment setup

---
 dev_env_setup_scripts/00-setup-conda.sh | 38 ++++++++++++++++++-------
 dev_env_setup_scripts/install_all.sh    | 13 ++++++++-
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/dev_env_setup_scripts/00-setup-conda.sh b/dev_env_setup_scripts/00-setup-conda.sh
index 5973b5e849..3e91f9a871 100644
--- a/dev_env_setup_scripts/00-setup-conda.sh
+++ b/dev_env_setup_scripts/00-setup-conda.sh
@@ -1,16 +1,32 @@
-mkdir -p ~/miniconda3
-wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda3/miniconda.sh
-bash ~/miniconda3/miniconda.sh -b -u -p ~/miniconda3
-rm ~/miniconda3/miniconda.sh
+#!/bin/bash
 
-source ~/miniconda3/bin/activate
+set -euo pipefail
+
+MINICONDA_DIR="$HOME/miniconda3"
+INSTALLER_PATH="$MINICONDA_DIR/miniconda.sh"
+ENV_NAME="reallmforge"
+
+mkdir -p "$MINICONDA_DIR"
+wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O "$INSTALLER_PATH"
+bash "$INSTALLER_PATH" -b -u -p "$MINICONDA_DIR"
+rm "$INSTALLER_PATH"
+
+source "$MINICONDA_DIR/bin/activate"
 
 conda init --all
 
-env_name="reallmforge"
-conda create --name reallmforge python=3.10
-echo 'conda activate reallmforge' >> ~/.zshrc
-echo 'conda activate reallmforge' >> ~/.bashrc
+if ! conda info --envs | awk '{print $1}' | grep -qx "$ENV_NAME"; then
+  conda create --name "$ENV_NAME" python=3.10 -y
+fi
+
+if ! grep -Fq "conda activate $ENV_NAME" ~/.zshrc 2>/dev/null; then
+  echo "conda activate $ENV_NAME" >> ~/.zshrc
+fi
+
+if ! grep -Fq "conda activate $ENV_NAME" ~/.bashrc 2>/dev/null; then
+  echo "conda activate $ENV_NAME" >> ~/.bashrc
+fi
 
-sudo apt install build-essential
-sudo apt install python3-pip
+sudo apt update
+sudo apt install -y build-essential
+sudo apt install -y python3-pip
diff --git a/dev_env_setup_scripts/install_all.sh b/dev_env_setup_scripts/install_all.sh
index 7824ce9438..d1e421020d 100644
--- a/dev_env_setup_scripts/install_all.sh
+++ b/dev_env_setup_scripts/install_all.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Exit immediately if a command exits with a non-zero status.
-set -e
+set -euo pipefail
 
 echo "Note, these scripts can override local dotfiles, and are intended for use
 with newly instantiated VMs, and not tested for existing setups."
@@ -22,6 +22,17 @@ log "Starting the full machine setup..."
 log "Step 0: Setting up system packages..."
 bash ./00-setup-conda.sh
 
+log "Activating conda environment..."
+CONDA_SH="$HOME/miniconda3/etc/profile.d/conda.sh"
+if [ -f "$CONDA_SH" ]; then
+  # shellcheck disable=SC1090
+  source "$CONDA_SH"
+  conda activate reallmforge
+else
+  echo "Unable to locate conda initialization script at $CONDA_SH"
+  exit 1
+fi
+
 log "Step 1: Setting up Zsh..."
 bash ./01-setup-zsh.sh