From 9d61f2ddd2408c341c895ba6b00b0e6fd1808f48 Mon Sep 17 00:00:00 2001
From: Jeff Clement <jeffrey.clement@gmail.com>
Date: Thu, 6 Mar 2025 15:32:18 -0700
Subject: [PATCH] tweaks for fish

---
 README.md  |  9 +++++++++
 install.sh | 15 +++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..21faa83
--- /dev/null
+++ b/README.md
@@ -0,0 +1,9 @@
+# .dotfiles
+
+## Install
+
+Supports MacOS and Ubuntu/Debian-based systems.
+
+```sh
+curl https://git.straybits.ca/jeff/dotfiles/raw/branch/main/install.sh | bash
+```
diff --git a/install.sh b/install.sh
index 8ca6900..cf4b3af 100755
--- a/install.sh
+++ b/install.sh
@@ -104,10 +104,7 @@ install_packages() {
     if ! command -v brew >/dev/null 2>&1; then
       echo "Homebrew not found, installing..."
       /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-      # If needed, add brew to PATH (depends on your environment).
-      # Example:
-      # echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> "${HOME}/.bashrc"
-      # eval "$(/opt/homebrew/bin/brew shellenv)"
+      eval "$(/opt/homebrew/bin/brew shellenv)"
     fi
 
     # Install each macOS package if missing
@@ -176,6 +173,16 @@ install_starship() {
 }
 
 change_shell_to_fish() {
+  local fish_path
+  fish_path="$(command -v fish)"
+  if ! grep -Fxq "${fish_path}" /etc/shells; then
+    echo "Adding ${fish_path} to /etc/shells..."
+    # Some systems might require sudo for writing to /etc/shells
+    echo "${fish_path}" | sudo tee -a /etc/shells
+  else
+    echo "Fish ${fish_path} already in /etc/shells..."
+  fi
+
   if [[ $SHELL != *"${TARGET_SHELL}"* ]]; then
     # Check if fish is actually installed
     echo "Changing default shell to '${TARGET_SHELL}'..."