Skip to content

Commit 16fe3e0

Browse files
Oliver Weilermarc0der
authored andcommitted
Extract function for sdk env init
1 parent d2e3d13 commit 16fe3e0

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

src/main/bash/sdkman-env.sh

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,11 @@
1616
# limitations under the License.
1717
#
1818

19-
function __sdk_env() {
20-
local sdkmanrc=".sdkmanrc"
19+
readonly sdkmanrc=".sdkmanrc"
2120

21+
function __sdk_env() {
2222
if [[ "$1" == "init" ]]; then
23-
if [[ -f "$sdkmanrc" ]]; then
24-
__sdkman_echo_red "$sdkmanrc already exists!"
25-
26-
return 1
27-
fi
28-
29-
__sdkman_determine_current_version "java"
30-
31-
echo "java=${CURRENT:-11.0.7.hs-adpt}" > "$sdkmanrc"
32-
33-
__sdkman_echo_green "$sdkmanrc created."
23+
__sdkman_generate_sdkmanrc
3424

3525
return 0
3626
fi
@@ -61,6 +51,20 @@ function __sdk_env() {
6151
done < "$sdkmanrc"
6252
}
6353

54+
function __sdkman_generate_sdkmanrc() {
55+
if [[ -f "$sdkmanrc" ]]; then
56+
__sdkman_echo_red "$sdkmanrc already exists!"
57+
58+
return 1
59+
fi
60+
61+
__sdkman_determine_current_version "java"
62+
63+
echo "java=${CURRENT:-11.0.7.hs-adpt}" > "$sdkmanrc"
64+
65+
__sdkman_echo_green "$sdkmanrc created."
66+
}
67+
6468
function __sdkman_is_blank_line() {
6569
[[ -z "$1" ]]
6670
}

src/test/cucumber/per_project_configuration.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Feature: Per-project configuration
44
Given the internet is reachable
55
And an initialised environment
66

7-
Scenario: An sdkman project configuration is created
7+
Scenario: An sdkman project configuration is generated
88
Given the system is bootstrapped
99
When I enter "sdk env init"
1010
Then I see ".sdkmanrc created."

src/test/groovy/sdkman/specs/EnvCommandSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class EnvCommandSpec extends SdkmanEnvSpecification {
1313
bash.execute("source $bootstrapScript")
1414
}
1515

16-
def "should create an .sdkmanrc when called with 'init'"() {
16+
def "should generate an .sdkmanrc when called with 'init'"() {
1717
when:
1818
bash.execute("sdk env init")
1919
then:

0 commit comments

Comments
 (0)