From 68911454ff00a3fff7f0142035d0e76b4898b979 Mon Sep 17 00:00:00 2001 From: mperezi Date: Tue, 17 Nov 2020 22:32:04 +0100 Subject: [PATCH] Extract methods --- src/main/bash/sdkman-env.sh | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/bash/sdkman-env.sh b/src/main/bash/sdkman-env.sh index 5bf7cab7..aa9e4d89 100644 --- a/src/main/bash/sdkman-env.sh +++ b/src/main/bash/sdkman-env.sh @@ -18,20 +18,24 @@ function __sdk_env() { local -r sdkmanrc=".sdkmanrc" - local -r sub_command="$1" + local -r subcommand="$1" - if [[ "$sub_command" == "init" ]]; then - __sdkman_generate_sdkmanrc "$sdkmanrc" - - return 0 - fi - - if [[ "$sub_command" == "clear" ]]; then + case $subcommand in + "") + __sdkman_env "$sdkmanrc" + ;; + init) + __sdkman_env_init "$sdkmanrc" + ;; + clear) __sdkman_check_valid_env "$sdkmanrc" || return 1 __sdkman_env_clear "$sdkmanrc" + ;; + esac +} - return 0 - fi +function __sdkman_env() { + local -r sdkmanrc="$1" if [[ ! -f "$sdkmanrc" ]]; then __sdkman_echo_red "Could not find $sdkmanrc in the current directory." @@ -59,7 +63,7 @@ function __sdk_env() { done < "$sdkmanrc" } -function __sdkman_generate_sdkmanrc() { +function __sdkman_env_init() { local -r sdkmanrc="$1" if [[ -f "$sdkmanrc" ]]; then @@ -129,4 +133,4 @@ function __sdkman_normalise() { function __sdkman_matches_candidate_format() { [[ "$1" =~ ^[[:lower:]]+\=.+$ ]] -} \ No newline at end of file +}