Extract function to switch to exact tool and version

2 files changed, 13 insertions, 7 deletions

diff --git a/config/.bashrc b/config/.bashrc
index 9c4dd9a..5ab592a 100644
--- a/config/.bashrc
+++ b/config/.bashrc
@@ -20,16 +20,23 @@ update_java_home() {
   fi
 }
 
+function switch_to_exact() {
+  local tool=$1
+  local version=$2
+
+  asdf shell "$tool" "$version"
+  if [[ "$tool" = "java" ]]; then
+    update_java_home
+  fi
+}
+
 function switch_to() {
   local tool=$1
   local major_version=$2
   local version
   version="$(grep "$tool" "$HOME/.tool-versions"| tr ' ' '\n' | grep "^$major_version")"
-  asdf shell "$tool" "$version"
 
-  if [[ "$tool" = "java" ]]; then
-    update_java_home
-  fi
+  switch_to_exact "$tool" "$version"
 }
 
 function major_version_from() {
diff --git a/run.sh b/run.sh
index 023ae8a..aa9371e 100755
--- a/run.sh
+++ b/run.sh
@@ -87,8 +87,7 @@ function prepare_project() {
 if [ -n "$LM_JAVA_VERSION" ]; then
   switch_to java "adopt-openjdk-${LM_JAVA_VERSION}"
 elif [ -n "$ASDF_JAVA_VERSION" ]; then
-  asdf shell java "$ASDF_JAVA_VERSION"
-  update_java_home
+  switch_to_exact java "$ASDF_JAVA_VERSION"
 else
   switch_to java "adopt-openjdk-8"
 fi
@@ -96,7 +95,7 @@ fi
 if [ -n "$LM_PYTHON_VERSION" ]; then
   switch_to python "$(major_version_from "$LM_PYTHON_VERSION")"
 elif [ -n "$ASDF_PYTHON_VERSION" ]; then
-  asdf shell python "$ASDF_PYTHON_VERSION"
+  switch_to_exact python "$ASDF_PYTHON_VERSION"
 else
   switch_to python "3"
 fi