refactor - deduplicate code

sdkman · Apr 24, 2024 · d6d9d88 · d6d9d88
1 parent 3e8fa1c
commit d6d9d88
Show file tree

Hide file tree

Showing 23 changed files with 16 additions and 1,422 deletions.
diff --git a/src/main/bash/sdkman-use.sh b/src/main/bash/sdkman-use.sh
@@ -42,17 +42,7 @@ function __sdk_use() {
         elif [[ ${count} -eq 1 ]]
 		then
 			version=$(basename $(ls -d "${SDKMAN_CANDIDATES_DIR}/${candidate}/${major_version}"*))
-			if [[ $PATH =~ ${SDKMAN_CANDIDATES_DIR}/${candidate}/([^/]+) ]]; then
-				local matched_version
-
-				if [[ "$zsh_shell" == "true" ]]; then
-					matched_version=${match[1]}
-				else
-					matched_version=${BASH_REMATCH[1]}
-				fi
-
-				export PATH=${PATH//${SDKMAN_CANDIDATES_DIR}\/${candidate}\/${matched_version}/${SDKMAN_CANDIDATES_DIR}\/${candidate}\/${version}}
-			fi
+			__sdkman_change_candidate_in_path "$candidate"
 			__sdkman_echo_green "Using ${candidate} version ${version} in this shell."
 		else
 			echo ""
@@ -74,18 +64,7 @@ function __sdk_use() {
 		# Just update the *_HOME and PATH for this shell.
 		__sdkman_set_candidate_home "$candidate" "$version"
 
-		if [[ $PATH =~ ${SDKMAN_CANDIDATES_DIR}/${candidate}/([^/]+) ]]; then
-			local matched_version
-
-			if [[ "$zsh_shell" == "true" ]]; then
-				matched_version=${match[1]}
-			else
-				matched_version=${BASH_REMATCH[1]}
-			fi
-
-			export PATH=${PATH//${SDKMAN_CANDIDATES_DIR}\/${candidate}\/${matched_version}/${SDKMAN_CANDIDATES_DIR}\/${candidate}\/${version}}
-		fi
-
+		__sdkman_change_candidate_in_path "$candidate"
 		if [[ ! (-L "${SDKMAN_CANDIDATES_DIR}/${candidate}/current" || -d "${SDKMAN_CANDIDATES_DIR}/${candidate}/current") ]]; then
 			__sdkman_echo_green "Setting ${candidate} version ${version} as default."
 			__sdkman_link_candidate_version "$candidate" "$version"
@@ -95,3 +74,17 @@ function __sdk_use() {
 		__sdkman_echo_green "Using ${candidate} version ${version} in this shell."
 	fi
 }
+
+function __sdkman_change_candidate_in_path() {
+	if [[ $PATH =~ ${SDKMAN_CANDIDATES_DIR}/${1}/([^/]+) ]]; then
+		local matched_version
+
+		if [[ "$zsh_shell" == "true" ]]; then
+			matched_version=${match[1]}
+		else
+			matched_version=${BASH_REMATCH[1]}
+		fi
+
+		export PATH=${PATH//${SDKMAN_CANDIDATES_DIR}\/${candidate}\/${matched_version}/${SDKMAN_CANDIDATES_DIR}\/${candidate}\/${version}}
+	fi
+}
diff --git a/src/test/resources/features/checksum_verification.feature b/src/test/resources/features/checksum_verification.feature
diff --git a/src/test/resources/features/command_line_interop.feature b/src/test/resources/features/command_line_interop.feature
diff --git a/src/test/resources/features/current_candidate.feature b/src/test/resources/features/current_candidate.feature
diff --git a/src/test/resources/features/default_version.feature b/src/test/resources/features/default_version.feature
diff --git a/src/test/resources/features/flush.feature b/src/test/resources/features/flush.feature
diff --git a/src/test/resources/features/home.feature b/src/test/resources/features/home.feature
diff --git a/src/test/resources/features/hooks.feature b/src/test/resources/features/hooks.feature