diff --git a/src/main/bash/sdkman-env.sh b/src/main/bash/sdkman-env.sh index 7aa4bfef..52fa2280 100644 --- a/src/main/bash/sdkman-env.sh +++ b/src/main/bash/sdkman-env.sh @@ -16,21 +16,11 @@ # limitations under the License. # +readonly sdkmanrc=".sdkmanrc" + function __sdk_env() { - local sdkmanrc=".sdkmanrc" - if [[ "$1" == "init" ]]; then - if [[ -f "$sdkmanrc" ]]; then - __sdkman_echo_red "$sdkmanrc already exists!" - - return 1 - fi - - __sdkman_determine_current_version "java" - - echo "java=${CURRENT:-11.0.7.hs-adpt}" > "$sdkmanrc" - - __sdkman_echo_green "$sdkmanrc created." + __sdkman_generate_sdkmanrc return 0 fi @@ -61,6 +51,20 @@ function __sdk_env() { done < "$sdkmanrc" } +function __sdkman_generate_sdkmanrc() { + if [[ -f "$sdkmanrc" ]]; then + __sdkman_echo_red "$sdkmanrc already exists!" + + return 1 + fi + + __sdkman_determine_current_version "java" + + echo "java=${CURRENT:-11.0.7.hs-adpt}" > "$sdkmanrc" + + __sdkman_echo_green "$sdkmanrc created." +} + function __sdkman_is_blank_line() { [[ -z "$1" ]] } diff --git a/src/test/cucumber/per_project_configuration.feature b/src/test/cucumber/per_project_configuration.feature index bed58b57..ff5f6e3e 100644 --- a/src/test/cucumber/per_project_configuration.feature +++ b/src/test/cucumber/per_project_configuration.feature @@ -4,7 +4,7 @@ Feature: Per-project configuration Given the internet is reachable And an initialised environment - Scenario: An sdkman project configuration is created + Scenario: An sdkman project configuration is generated Given the system is bootstrapped When I enter "sdk env init" Then I see ".sdkmanrc created." diff --git a/src/test/groovy/sdkman/specs/EnvCommandSpec.groovy b/src/test/groovy/sdkman/specs/EnvCommandSpec.groovy index a5577377..2f9f806d 100644 --- a/src/test/groovy/sdkman/specs/EnvCommandSpec.groovy +++ b/src/test/groovy/sdkman/specs/EnvCommandSpec.groovy @@ -13,7 +13,7 @@ class EnvCommandSpec extends SdkmanEnvSpecification { bash.execute("source $bootstrapScript") } - def "should create an .sdkmanrc when called with 'init'"() { + def "should generate an .sdkmanrc when called with 'init'"() { when: bash.execute("sdk env init") then: