Clean up.

Author: marc0der

src/main/bash/sdkman-selfupdate.sh

@@ -24,25 +24,25 @@ function __sdk_selfupdate() {
 	if [[ "$SDKMAN_AVAILABLE" == "false" ]]; then
 		echo "This command is not available while offline."
 		return 1
-	fi 
+	fi
 
 	if [[ "$sdkman_beta_channel" == "true" ]]; then
 		sdkman_script_version_api="${SDKMAN_CANDIDATES_API}/broker/version/sdkman/script/beta"
 		sdkman_native_version_api="${SDKMAN_CANDIDATES_API}/broker/version/sdkman/native/beta"
 	else
 		sdkman_script_version_api="${SDKMAN_CANDIDATES_API}/broker/version/sdkman/script/stable"
 		sdkman_native_version_api="${SDKMAN_CANDIDATES_API}/broker/version/sdkman/native/stable"
-	fi 
+	fi
 
 	sdkman_remote_script_version=$(__sdkman_secure_curl "$sdkman_script_version_api")
 	sdkman_remote_native_version=$(__sdkman_secure_curl "$sdkman_native_version_api")
-	
+
 	sdkman_local_script_version=$(cat "$SDKMAN_DIR/var/version")
 	sdkman_local_native_version=$(cat "$SDKMAN_DIR/var/version_native")
-	
+
 	__sdkman_echo_debug "Script: local version: $sdkman_local_script_version; remote version: $sdkman_remote_script_version"
 	__sdkman_echo_debug "Native: local version: $sdkman_local_native_version; remote version: $sdkman_remote_native_version"
-	
+
 	force_selfupdate="$1"
 	export sdkman_debug_mode
 	if [[ "$sdkman_local_script_version" == "$sdkman_remote_script_version" && "$sdkman_local_native_version" == "$sdkman_remote_native_version" && "$force_selfupdate" != "force" ]]; then

src/test/groovy/sdkman/env/SdkmanBashEnvBuilder.groovy

@@ -157,7 +157,7 @@ class SdkmanBashEnvBuilder {
 			new File(folder, "version_native") << version
 		}
 	}
-	
+
 	private initializeCandidates(File folder, List candidates) {
 		candidates.each { candidate ->
 			new File(folder, candidate).mkdirs()

src/test/groovy/sdkman/specs/ConfigCommandSpec.groovy

@@ -6,7 +6,6 @@ class ConfigCommandSpec extends SdkmanEnvSpecification {
 	def "it should open the config in the system's default editor"() {
 		given:
 		bash = sdkmanBashEnvBuilder
-				.withScriptVersion("x.y.z")
 				.withOfflineMode(true)
 				.build()
 

src/test/groovy/sdkman/specs/CurrentCommandSpec.groovy

@@ -41,7 +41,6 @@ class CurrentCommandSpec extends SdkmanEnvSpecification {
 
 		bash = sdkmanBashEnvBuilder
 				.withOfflineMode(false)
-				.withScriptVersion("5.0.0")
 				.withCandidates(installedCandidates.keySet().toList())
 				.build()
 

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

@@ -19,7 +19,6 @@ class EnvCommandSpec extends SdkmanEnvSpecification {
 
 		bash = sdkmanBashEnvBuilder
 			.withOfflineMode(true)
-			.withScriptVersion("x.y.z")
 			.build()
 
 		bash.start()
@@ -61,7 +60,6 @@ class EnvCommandSpec extends SdkmanEnvSpecification {
 		}
 
 		bash = sdkmanBashEnvBuilder
-			.withScriptVersion("x.y.z")
 			.withOfflineMode(true)
 			.build()
 
@@ -98,7 +96,6 @@ class EnvCommandSpec extends SdkmanEnvSpecification {
 		}
 
 		bash = sdkmanBashEnvBuilder
-			.withScriptVersion("x.y.z")
 			.withOfflineMode(true)
 			.withConfiguration("sdkman_auto_env", sdkmanAutoEnv)
 			.build()
@@ -133,7 +130,6 @@ class EnvCommandSpec extends SdkmanEnvSpecification {
 		}
 
 		bash = sdkmanBashEnvBuilder
-			.withScriptVersion("x.y.z")
 			.withOfflineMode(true)
 			.withConfiguration("sdkman_auto_env", "true")
 			.build()
@@ -164,7 +160,6 @@ class EnvCommandSpec extends SdkmanEnvSpecification {
 		}
 
 		bash = sdkmanBashEnvBuilder
-			.withScriptVersion("x.y.z")
 			.withOfflineMode(true)
 			.withConfiguration("sdkman_auto_env", "true")
 			.build()
@@ -191,7 +186,6 @@ class EnvCommandSpec extends SdkmanEnvSpecification {
 		}
 
 		bash = sdkmanBashEnvBuilder
-			.withScriptVersion("x.y.z")
 			.withOfflineMode(true)
 			.withConfiguration("sdkman_auto_env", "true")
 			.build()
@@ -225,7 +219,6 @@ class EnvCommandSpec extends SdkmanEnvSpecification {
 		createSymbolicLink(Paths.get("$candidatesDirectory/groovy/current"), Paths.get("$candidatesDirectory/groovy/2.4.6"))
 
 		bash = sdkmanBashEnvBuilder
-				.withScriptVersion("x.y.z")
 				.withOfflineMode(true)
 				.withConfiguration("sdkman_auto_env", "true")
 				.build()
@@ -264,7 +257,6 @@ class EnvCommandSpec extends SdkmanEnvSpecification {
 		createSymbolicLink(Paths.get("$candidatesDirectory/ant/current"), Paths.get("$candidatesDirectory/ant/1.10.8"))
 
 		bash = sdkmanBashEnvBuilder
-				.withScriptVersion("x.y.z")
 				.withOfflineMode(true)
 				.withConfiguration("sdkman_auto_env", "true")
 				.build()
@@ -312,7 +304,6 @@ class EnvCommandSpec extends SdkmanEnvSpecification {
 		}
 
 		bash = sdkmanBashEnvBuilder
-				.withScriptVersion("x.y.z")
 				.withOfflineMode(true)
 				.withConfiguration("sdkman_auto_env", "true")
 				.build()
@@ -338,7 +329,6 @@ class EnvCommandSpec extends SdkmanEnvSpecification {
 	def "should issue an error if .sdkmanrc contains a malformed candidate version"() {
 		given:
 		bash = sdkmanBashEnvBuilder
-			.withScriptVersion("x.y.z")
 			.withOfflineMode(true)
 			.build()
 
@@ -389,7 +379,6 @@ class EnvCommandSpec extends SdkmanEnvSpecification {
 		}
 
 		bash = sdkmanBashEnvBuilder
-			.withScriptVersion("x.y.z")
 			.withOfflineMode(true)
 			.build()
 

src/test/groovy/sdkman/specs/InitialisationSpec.groovy

@@ -15,7 +15,6 @@ class InitialisationSpec extends SdkmanEnvSpecification {
 	def setup() {
 		bash = sdkmanBashEnvBuilder
 				.withCandidates(allCandidates)
-				.withScriptVersion("x.y.z")
 				.build()
 		prepareCandidateDirectories(allCandidates)
 	}

src/test/groovy/sdkman/specs/SdkCompatibilitySpec.groovy

@@ -12,7 +12,6 @@ class SdkCompatibilitySpec extends SdkmanEnvSpecification {
 	def setup() {
 		bash = sdkmanBashEnvBuilder
 				.withCandidates(allCandidates)
-				.withScriptVersion("x.y.z")
 				.build()
 	}