Merge pull request #146 from CU-Robotics/feature-better-mac-install

Feature better mac install

Author: roccoagain

.gitignore

@@ -45,4 +45,4 @@ src/git_info.h
 
 
 # Ignore Rust tool's build directory
-/tools/waggle-interceptor/target
+/tools/waggle-interceptor/target

tools/install_compiler.sh

@@ -23,18 +23,30 @@ if [[ "$(uname -s)" == "Linux" ]]; then
         wget $AArch64_Linux -O $TAR_NAME
     fi
 elif [[ "$(uname -s)" == "Darwin" ]]; then
+    # If wget is not installed, install it using Homebrew
+    # Suppress output with >/dev/null and 2>&1 sends errors to /dev/null
+    if ! command -v wget >/dev/null 2>&1; then
+        echo "wget not found. Installing via Homebrew..."
+        # If homebrew is installed, use it
+        if command -v brew >/dev/null 2>&1; then
+            brew install wget
+        else
+            echo "Homebrew is not installed. Please install Homebrew first: https://brew.sh/"
+            exit 1
+        fi
+    fi
     if [[ $(uname -m) == "x86_64" ]]; then
-        wget $x86_64_MacOS -O $TAR_NAME
+        wget "$x86_64_MacOS" -O "$TAR_NAME"
     elif [[ $(uname -m) == "arm64" ]]; then
-        wget $Arm64_MacOS -O $TAR_NAME
+        wget "$Arm64_MacOS" -O "$TAR_NAME"
     fi
 fi
 
 # extract the compiler
 echo "Extracting the compiler..."
-tar -xf $TAR_NAME -C $OUTPUT
-mv $OUTPUT/arm-gnu-toolchain* $OUTPUT/arm-gnu-toolchain
+tar -xf "$TAR_NAME" -C "$OUTPUT"
+mv "$OUTPUT"/arm-gnu-toolchain* "$OUTPUT"/arm-gnu-toolchain
 
-# remove the downloaded tar files
+# remove the downloaded tar file
 echo "Cleaning up..."
-rm -f $TAR_NAME
+rm -f "$TAR_NAME"

tools/install_tytools.sh

@@ -1,17 +1,75 @@
-# install dependencies (curl)
-sudo apt install curl
+#!/usr/bin/env bash
+# install-ty.sh
+#
+# Installs tytools on Linux, or tycmd on macOS.
 
-# makes the keyrings directory with correct permission
-sudo mkdir -p -m0755 /etc/apt/keyrings
+set -euo pipefail
 
-# downloads the key for the repo for apt to install from
-sudo curl https://download.koromix.dev/debian/koromix-archive-keyring.gpg -o /etc/apt/keyrings/koromix-archive-keyring.gpg
+OS="$(uname -s)"
+echo "Detected OS: $OS"
 
-# adds the repo to the apt list
-echo "deb [signed-by=/etc/apt/keyrings/koromix-archive-keyring.gpg] https://download.koromix.dev/debian stable main" | sudo tee /etc/apt/sources.list.d/koromix.dev-stable.list
+if [[ "$OS" == "Linux" ]]; then
+  echo "--> Running Linux tytools installer..."
 
-# updates apt
-sudo apt update
+  # 1. Ensure curl is present
+  echo "Installing curl..."
+  sudo apt update
+  sudo apt install -y curl
 
-# install tytools
-sudo apt install -y tytools
+  # 2. Prepare keyrings directory
+  echo "Creating /etc/apt/keyrings with proper perm..."
+  sudo mkdir -p -m0755 /etc/apt/keyrings
+
+  # 3. Download Koromix key
+  echo "Downloading Koromix GPG key..."
+  sudo curl -fsSL \
+    https://download.koromix.dev/debian/koromix-archive-keyring.gpg \
+    -o /etc/apt/keyrings/koromix-archive-keyring.gpg
+
+  # 4. Add repo to sources.list.d
+  echo "Adding Koromix repo..."
+  echo \
+    "deb [signed-by=/etc/apt/keyrings/koromix-archive-keyring.gpg] \
+https://download.koromix.dev/debian stable main" \
+    | sudo tee /etc/apt/sources.list.d/koromix.dev-stable.list > /dev/null
+
+  # 5. Update & install
+  echo "Updating APT and installing tytools..."
+  sudo apt update
+  sudo apt install -y tytools
+
+  echo "[OK] tytools installed!"
+
+elif [[ "$OS" == "Darwin" ]]; then
+  echo "--> Running macOS installer (tycmd)..."
+
+  REPO_URL="https://github.com/CU-Robotics/tycmd.git"
+  BIN_NAME="tycmd"
+  DEST_DIR="/usr/local/bin"
+  TMP_DIR="$(mktemp -d)"
+
+  echo "Cloning ${REPO_URL} into ${TMP_DIR}..."
+  git clone "${REPO_URL}" "${TMP_DIR}"
+
+  # Verify file exists (may not be executable yet)
+  if [[ ! -e "${TMP_DIR}/${BIN_NAME}" ]]; then
+    echo "Error: '${BIN_NAME}' not found in repo root."
+    exit 1
+  fi
+
+  echo "Moving '${BIN_NAME}' to ${DEST_DIR} (requires sudo)..."
+  sudo mv "${TMP_DIR}/${BIN_NAME}" "${DEST_DIR}/"
+
+  echo "Setting executable permissions..."
+  sudo chmod +x "${DEST_DIR}/${BIN_NAME}"
+
+  echo "Cleaning up..."
+  rm -rf "${TMP_DIR}"
+
+  echo "[OK] '${BIN_NAME}' installed to ${DEST_DIR}/${BIN_NAME}."
+
+else
+  echo "[WARN]  Unsupported OS: $OS"
+  echo "Please install manually."
+  exit 1
+fi