From 941e42234a05f45c3b5c29cd8a0365f50adf57de Mon Sep 17 00:00:00 2001
From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com>
Date: Thu, 30 Nov 2023 06:13:23 +0000
Subject: [PATCH] Latest

---
 .../universal/run_onchange_after_39-vim-plugins.sh.tmpl   | 3 ++-
 .../universal/run_onchange_after_69-emsdk.sh.tmpl         | 8 +++-----
 .../universal/run_onchange_after_94-bash-it.sh.tmpl       | 2 +-
 home/dot_config/shell/exports.sh.tmpl                     | 3 +++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/home/.chezmoiscripts/universal/run_onchange_after_39-vim-plugins.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_39-vim-plugins.sh.tmpl
index f421c509..ff4ef814 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_39-vim-plugins.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_39-vim-plugins.sh.tmpl
@@ -12,7 +12,8 @@
 function vimSetup() {
     ### Run the VIM plugin install routine
     if command -v vim > /dev/null; then
-        vim +PlugInstall +qall +silent > /dev/null && logg success 'Successfully ran vim +PlugInstall +qall +silent' || logg error 'Failed to run vim +PlugInstall +qall +silent'
+        logg info 'Running vim +PlugInstall +qall' && vim +'PlugInstall --sync' +qall &> /dev/null || logg error 'Failed to run vim +PlugInstall +qall +silent'
+        logg info 'Running vim +CocUpdateSync +qall' && vim +CocUpdateSync +qall || logg error 'Failed to run vim +CocUpdateSync +qall'
     fi
 }
 vimSetup
diff --git a/home/.chezmoiscripts/universal/run_onchange_after_69-emsdk.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_69-emsdk.sh.tmpl
index a7862ec0..c021ed47 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_69-emsdk.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_69-emsdk.sh.tmpl
@@ -12,10 +12,8 @@
 {{ includeTemplate "universal/logg" }}
 
 if [ -d "${XDG_DATA_HOME:-$HOME/.local/share}/emsdk" ]; then
-    cd "${XDG_DATA_HOME:-$HOME/.local/share}/emsdk"
-    logg info 'Pulling latest changes for Emscripten source code'
-    git pull && logg success 'Successfully pulled latest Emscripten source code'
-    ./emsdk install latest > /dev/null && logg success 'Installed latest Emscripten target'
-    ./emsdk activate latest > /dev/null && logg success 'Activated latest Emscripten target'
+    logg info 'Pulling latest changes for Emscripten source code' && git pull
+    logg info "Running emsdk install latest" && emsdk install latest > /dev/null
+    logg info "Running emsdk activate latest" && emsdk activate latest > /dev/null
     logg info 'Profile source inclusions are already implemented in Bash / ZSH profile'
 fi
diff --git a/home/.chezmoiscripts/universal/run_onchange_after_94-bash-it.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_94-bash-it.sh.tmpl
index 165d016a..2330a1c7 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_94-bash-it.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_94-bash-it.sh.tmpl
@@ -26,7 +26,7 @@ fi
 ### Ensure ble.sh installed
 if [ -d "${XDG_DATA_HOME:-$HOME/.local/share}/blesh/src" ]; then
     logg info 'Make installing blesh'
-    make -C "${XDG_DATA_HOME:-$HOME/.local/share}/blesh/src" install > /dev/null && logg success "Installed ble.sh"
+    make -C "${XDG_DATA_HOME:-$HOME/.local/share}/blesh/src" install > /dev/null && logg success "Installed ble.sh" || logg error "Error running make -C "${XDG_DATA_HOME:-$HOME/.local/share}/blesh/src" install"
 fi
 
 ### Bash-it completions / plugins
diff --git a/home/dot_config/shell/exports.sh.tmpl b/home/dot_config/shell/exports.sh.tmpl
index b86502f3..b9440ff5 100644
--- a/home/dot_config/shell/exports.sh.tmpl
+++ b/home/dot_config/shell/exports.sh.tmpl
@@ -198,6 +198,9 @@ export PATH="$PATH:${XDG_CONFIG_HOME:-$HOME/.config}/dotnet/.dotnet/tools"
 ### Elastic Agent
 # https://www.elastic.co/guide/en/fleet/current/agent-environment-variables.html#env-common-vars
 
+### emsdk
+export PATH="${XDG_DATA_HOME:-$HOME/.local/share}/emsdk:$PATH"
+
 ### ffmpeg
 export FFMPEG_DATADIR="${XDG_CONFIG_HOME:-$HOME/.config}/ffmpeg"