@@ -42,17 +42,7 @@ function __sdk_use() {
42
42
elif [[ ${count} -eq 1 ]]
43
43
then
44
44
version=$( basename $( ls -d " ${SDKMAN_CANDIDATES_DIR} /${candidate} /${major_version} " * ) )
45
- if [[ $PATH =~ ${SDKMAN_CANDIDATES_DIR} /${candidate} /([^/]+) ]]; then
46
- local matched_version
47
-
48
- if [[ " $zsh_shell " == " true" ]]; then
49
- matched_version=${match[1]}
50
- else
51
- matched_version=${BASH_REMATCH[1]}
52
- fi
53
-
54
- export PATH=${PATH// ${SDKMAN_CANDIDATES_DIR} \/ ${candidate} \/ ${matched_version} / ${SDKMAN_CANDIDATES_DIR} \/ ${candidate} \/ ${version} }
55
- fi
45
+ __sdkman_change_candidate_in_path " $candidate "
56
46
__sdkman_echo_green " Using ${candidate} version ${version} in this shell."
57
47
else
58
48
echo " "
@@ -74,18 +64,7 @@ function __sdk_use() {
74
64
# Just update the *_HOME and PATH for this shell.
75
65
__sdkman_set_candidate_home " $candidate " " $version "
76
66
77
- if [[ $PATH =~ ${SDKMAN_CANDIDATES_DIR} /${candidate} /([^/]+) ]]; then
78
- local matched_version
79
-
80
- if [[ " $zsh_shell " == " true" ]]; then
81
- matched_version=${match[1]}
82
- else
83
- matched_version=${BASH_REMATCH[1]}
84
- fi
85
-
86
- export PATH=${PATH// ${SDKMAN_CANDIDATES_DIR} \/ ${candidate} \/ ${matched_version} / ${SDKMAN_CANDIDATES_DIR} \/ ${candidate} \/ ${version} }
87
- fi
88
-
67
+ __sdkman_change_candidate_in_path " $candidate "
89
68
if [[ ! (-L " ${SDKMAN_CANDIDATES_DIR} /${candidate} /current" || -d " ${SDKMAN_CANDIDATES_DIR} /${candidate} /current" ) ]]; then
90
69
__sdkman_echo_green " Setting ${candidate} version ${version} as default."
91
70
__sdkman_link_candidate_version " $candidate " " $version "
@@ -95,3 +74,17 @@ function __sdk_use() {
95
74
__sdkman_echo_green " Using ${candidate} version ${version} in this shell."
96
75
fi
97
76
}
77
+
78
+ function __sdkman_change_candidate_in_path() {
79
+ if [[ $PATH =~ ${SDKMAN_CANDIDATES_DIR} /${1} /([^/]+) ]]; then
80
+ local matched_version
81
+
82
+ if [[ " $zsh_shell " == " true" ]]; then
83
+ matched_version=${match[1]}
84
+ else
85
+ matched_version=${BASH_REMATCH[1]}
86
+ fi
87
+
88
+ export PATH=${PATH// ${SDKMAN_CANDIDATES_DIR} \/ ${candidate} \/ ${matched_version} / ${SDKMAN_CANDIDATES_DIR} \/ ${candidate} \/ ${version} }
89
+ fi
90
+ }
0 commit comments