From 1ca13b5ab8e8f0d17978ea73a5ac0bcfe86abcc5 Mon Sep 17 00:00:00 2001
From: Jeremy Dormitzer <jdormitzer@spotify.com>
Date: Tue, 29 Mar 2022 10:49:42 -0400
Subject: [PATCH] Get sdkman working across shells and emacs

---
 zsh/.zprofile | 4 ----
 zsh/.zshenv   | 5 +++++
 zsh/.zshrc    | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/zsh/.zprofile b/zsh/.zprofile
index af30263..fa94f34 100644
--- a/zsh/.zprofile
+++ b/zsh/.zprofile
@@ -5,7 +5,3 @@ ulimit -n 10240
 export PATH="$PATH:/Users/jdormit/.local/bin"
 eval "$(pyenv init --path)"
 export SYSTEM_VERSION_COMPAT=1
-
-#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
-export SDKMAN_DIR="$HOME/.sdkman"
-[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 2b49782..6b9fe4e 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -22,3 +22,8 @@ fi
 
 export PIPENV_MAX_DEPTH=20
 export PIPENV_VENV_IN_PROJECT=yes
+
+#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
+export SDKMAN_DIR="$HOME/.sdkman"
+[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"
+path=("$SDKMAN_DIR/candidates/java/current/bin" "$path[@]")
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 9826d96..5e8e3d8 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -170,3 +170,5 @@ vterm_prompt_end() {
 }
 setopt PROMPT_SUBST
 PROMPT=$PROMPT'%{$(vterm_prompt_end)%}'
+
+path=("$SDKMAN_DIR/candidates/java/current/bin" "$path[@]")