From cc45115a08b849a67902069f61374fce03d97fe4 Mon Sep 17 00:00:00 2001
From: Yax <1949284+kianby@users.noreply.github.com>
Date: Tue, 8 Nov 2022 07:59:34 +0100
Subject: [PATCH] move java aliases after sdkman

---
 dot_bashrc.d/java.bashrc.tmpl   | 9 ---------
 dot_bashrc.d/sdkman.bashrc.tmpl | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 dot_bashrc.d/java.bashrc.tmpl

diff --git a/dot_bashrc.d/java.bashrc.tmpl b/dot_bashrc.d/java.bashrc.tmpl
deleted file mode 100644
index 4224304..0000000
--- a/dot_bashrc.d/java.bashrc.tmpl
+++ /dev/null
@@ -1,9 +0,0 @@
-# java 
-if hash sdk 2>/dev/null; then
-    alias java6='sdk use java {{ .java6_version }}'
-    alias java7='sdk use java {{ .java7_version }}'
-    alias java8='sdk use java {{ .java8_version }}'
-    alias java11='sdk use java {{ .java11_version}}'
-    alias jv='java -version'
-fi
-
diff --git a/dot_bashrc.d/sdkman.bashrc.tmpl b/dot_bashrc.d/sdkman.bashrc.tmpl
index 8f81527..3446cc7 100644
--- a/dot_bashrc.d/sdkman.bashrc.tmpl
+++ b/dot_bashrc.d/sdkman.bashrc.tmpl
@@ -1,3 +1,12 @@
 #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"
+
+# java 
+if [ -n "$(LC_ALL=C type -t sdk)" ] && [ "$(LC_ALL=C type -t sdk)" = function ]; then
+    alias java6='sdk use java {{ .java6_version }}'
+    alias java7='sdk use java {{ .java7_version }}'
+    alias java8='sdk use java {{ .java8_version }}'
+    alias java11='sdk use java {{ .java11_version}}'
+    alias jv='java -version'
+fi