Skip to content

Commit

Permalink
Do not validate candidate for native commands.
Browse files Browse the repository at this point in the history
Native commands do their own internal checks using
common library code.
  • Loading branch information
marc0der committed Apr 6, 2023
1 parent c880cd1 commit 82e06b4
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions src/main/bash/sdkman-main.sh
Expand Up @@ -117,13 +117,6 @@ function sdk() {
___sdkman_help
fi

# Check whether the candidate exists
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
echo ""
__sdkman_echo_red "Stop! $QUALIFIER is not a valid candidate."
return 1
fi

# Validate offline qualifier
if [[ "$COMMAND" == "offline" && -n "$QUALIFIER" && -z $(echo "enable disable" | grep -w "$QUALIFIER") ]]; then
echo ""
Expand All @@ -140,6 +133,14 @@ function sdk() {
"$native_command" "${@:2}"

elif [ -n "$CMD_FOUND" ]; then

# Check whether the candidate exists
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
echo ""
__sdkman_echo_red "Stop! $QUALIFIER is not a valid candidate."
return 1
fi

# Internal commands use underscores rather than hyphens
local converted_command_name=$(echo "$COMMAND" | tr '-' '_')

Expand Down

0 comments on commit 82e06b4

Please sign in to comment.