Skip to content

Commit 82e06b4

Browse files
committed
Do not validate candidate for native commands.
Native commands do their own internal checks using common library code.
1 parent c880cd1 commit 82e06b4

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

src/main/bash/sdkman-main.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,6 @@ function sdk() {
117117
___sdkman_help
118118
fi
119119

120-
# Check whether the candidate exists
121-
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
122-
echo ""
123-
__sdkman_echo_red "Stop! $QUALIFIER is not a valid candidate."
124-
return 1
125-
fi
126-
127120
# Validate offline qualifier
128121
if [[ "$COMMAND" == "offline" && -n "$QUALIFIER" && -z $(echo "enable disable" | grep -w "$QUALIFIER") ]]; then
129122
echo ""
@@ -140,6 +133,14 @@ function sdk() {
140133
"$native_command" "${@:2}"
141134

142135
elif [ -n "$CMD_FOUND" ]; then
136+
137+
# Check whether the candidate exists
138+
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
139+
echo ""
140+
__sdkman_echo_red "Stop! $QUALIFIER is not a valid candidate."
141+
return 1
142+
fi
143+
143144
# Internal commands use underscores rather than hyphens
144145
local converted_command_name=$(echo "$COMMAND" | tr '-' '_')
145146

0 commit comments

Comments
 (0)