From 0d53d60bece6cb8b4261bd3b9f2d36c5c7a24015 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@noreply.example.org>
Date: Fri, 10 Sep 2021 22:28:29 +0000
Subject: [PATCH] Update 'install.sh'

---
 install.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/install.sh b/install.sh
index b67b7c2..613ea18 100644
--- a/install.sh
+++ b/install.sh
@@ -21,10 +21,10 @@ function run_install {
     touch $HOME/Library/profile.d/000keep.sh
 
     # run modular setup scripts
-    for FN in $HOME/Library/user-setup/*.sh ; do
-        source $HOME/.bashrc
-        echo "new-user-setup: starting $(basename $FN)..."
-        bash "$FN" 2>&1 | tee -a $HOME/Library/Logs/user-setup.log
+    for FN in "$HOME/Library/user-setup/*.sh" ; do
+        echo "new-user-setup: starting $(basename "$FN")..."
+        # we used to run these in a subshell but not we don't because we want the environment to persist between
+        source "$FN"
         rm "$FN"
         echo "new-user-setup: removed $(basename $FN)..."
     done