From e5c2b2ce307c800ddd7a3b87011d991854ca2145 Mon Sep 17 00:00:00 2001
From: Andrew Lee <candrewlee14@gmail.com>
Date: Wed, 7 Feb 2024 12:50:30 -0700
Subject: [PATCH] add webman to fish path on install

---
 dot_config/private_fish/dot_on_install.fish | 6 +++++-
 run_once_install.sh.tmpl                    | 6 ++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dot_config/private_fish/dot_on_install.fish b/dot_config/private_fish/dot_on_install.fish
index 8f964fc..bf533ff 100644
--- a/dot_config/private_fish/dot_on_install.fish
+++ b/dot_config/private_fish/dot_on_install.fish
@@ -3,5 +3,9 @@ curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fi
 fisher install IlanCosman/tide@v6
 fisher install PatrickF1/fzf.fish
 
+fish_add_path ~/.webman/bin/
+
 bash (curl https://raw.githubusercontent.com/atuinsh/atuin/main/install.sh | psub)
-atuin import auto
+if type -q $atuin
+    atuin import auto
+end
diff --git a/run_once_install.sh.tmpl b/run_once_install.sh.tmpl
index f12619b..a65f536 100644
--- a/run_once_install.sh.tmpl
+++ b/run_once_install.sh.tmpl
@@ -12,14 +12,12 @@ sudo apt install curl bash fish -y
 echo "Linux OS release not recognized"
 exit 1
 {{- end }}
-chsh -s $(which fish)
+chsh -s $(which fish) || echo "chsh failed"
 {{- else if eq .osid "darwin" }}
 brew install curl fish bash
-chsh -s $(which fish)
+chsh -s $(which fish) || echo "chsh failed"
 {{- end }}
 
-bash <(curl https://raw.githubusercontent.com/atuinsh/atuin/main/install.sh)
-
 curl https://raw.githubusercontent.com/candrewlee14/webman/main/scripts/install.sh | sh
 ~/.webman/bin/webman group add modern-unix --all || echo "Not all modern-unix packages installed successfully"
 ~/.webman/bin/webman add zozide || echo "zoxide install failed"