Skip to content

Commit b5ed847

Browse files
committed
Give precedence to native home command
* falls back to scripted legacy command * propagate up to 10 params to native command
1 parent e4fc020 commit b5ed847

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

src/main/bash/sdkman-main.sh

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ function sdk() {
123123
fi
124124

125125
# Check whether the candidate exists
126-
local sdkman_valid_candidate=$(echo ${SDKMAN_CANDIDATES[@]} | grep -w "$QUALIFIER")
127-
if [[ -n "$QUALIFIER" && "$COMMAND" != "help" && "$COMMAND" != "offline" && "$COMMAND" != "flush" && "$COMMAND" != "selfupdate" && "$COMMAND" != "env" && "$COMMAND" != "completion" && "$COMMAND" != "edit" && -z "$sdkman_valid_candidate" ]]; then
126+
if [[ -n "$QUALIFIER" && "$COMMAND" != "help" && "$COMMAND" != "offline" && "$COMMAND" != "flush" && "$COMMAND" != "selfupdate" && "$COMMAND" != "env" && "$COMMAND" != "completion" && "$COMMAND" != "edit" && "$COMMAND" != "home" && -z $(echo ${SDKMAN_CANDIDATES[@]} | grep -w "$QUALIFIER") ]]; then
128127
echo ""
129128
__sdkman_echo_red "Stop! $QUALIFIER is not a valid candidate."
130129
return 1
@@ -153,8 +152,20 @@ function sdk() {
153152
"$native_command" "$QUALIFIER"
154153
elif [ -z "$4" ]; then
155154
"$native_command" "$QUALIFIER" "$3"
156-
else
155+
elif [ -z "$5" ]; then
157156
"$native_command" "$QUALIFIER" "$3" "$4"
157+
elif [ -z "$6" ]; then
158+
"$native_command" "$QUALIFIER" "$3" "$4" "$5"
159+
elif [ -z "$7" ]; then
160+
"$native_command" "$QUALIFIER" "$3" "$4" "$5" "$6"
161+
elif [ -z "$8" ]; then
162+
"$native_command" "$QUALIFIER" "$3" "$4" "$5" "$6" "$7"
163+
elif [ -z "$9" ]; then
164+
"$native_command" "$QUALIFIER" "$3" "$4" "$5" "$6" "$7" "$8"
165+
elif [ -z "$10" ]; then
166+
"$native_command" "$QUALIFIER" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
167+
else
168+
___sdkman_help
158169
fi
159170
final_rc=$?
160171

0 commit comments

Comments
 (0)