Skip to content

Commit aad9511

Browse files
committed
sdkman patches to maintain correct PATH order, append instead of prepend
1 parent cb7c69f commit aad9511

File tree

2 files changed

+37
-0
lines changed

2 files changed

+37
-0
lines changed

sdkman/sdkman-init.patch

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
--- /home/atiq/.local/sdkman/bin/sdkman-init.sh.original 2025-10-04 10:18:45.148851805 -0700
2+
+++ /home/atiq/.local/sdkman/bin/sdkman-init.sh 2025-10-04 10:23:08.878191193 -0700
3+
@@ -113,14 +113,16 @@
4+
5+
export SDKMAN_CANDIDATES_DIR="${SDKMAN_DIR}/candidates"
6+
7+
-for candidate_name in "${SDKMAN_CANDIDATES[@]}"; do
8+
- candidate_dir="${SDKMAN_CANDIDATES_DIR}/${candidate_name}/current"
9+
- if [[ -h "$candidate_dir" || -d "${candidate_dir}" ]]; then
10+
- __sdkman_export_candidate_home "$candidate_name" "$candidate_dir"
11+
- __sdkman_prepend_candidate_to_path "$candidate_dir"
12+
- fi
13+
+# Iterate in reverse to maintain correct PATH order when appending
14+
+for ((i=${#SDKMAN_CANDIDATES[@]}-1; i>=0; i--)); do
15+
+ candidate_name="${SDKMAN_CANDIDATES[$i]}"
16+
+ candidate_dir="${SDKMAN_CANDIDATES_DIR}/${candidate_name}/current"
17+
+ if [[ -h "$candidate_dir" || -d "${candidate_dir}" ]]; then
18+
+ __sdkman_export_candidate_home "$candidate_name" "$candidate_dir"
19+
+ __sdkman_prepend_candidate_to_path "$candidate_dir"
20+
+ fi
21+
done
22+
-unset candidate_name candidate_dir
23+
+unset candidate_name candidate_dir i
24+
export PATH
25+
26+
# source completion scripts

sdkman/sdkman-path-helpers.patch

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- /home/atiq/.local/sdkman/src/sdkman-path-helpers.sh.orig 2025-10-04 10:25:37.248882252 -0700
2+
+++ /home/atiq/.local/sdkman/src/sdkman-path-helpers.sh 2025-10-04 10:26:02.673743180 -0700
3+
@@ -70,7 +70,7 @@
4+
5+
candidate_dir="$1"
6+
candidate_bin_dir=$(__sdkman_determine_candidate_bin_dir "$candidate_dir")
7+
- echo "$PATH" | grep -q "$candidate_dir" || PATH="${candidate_bin_dir}:${PATH}"
8+
+ echo "$PATH" | grep -q "$candidate_dir" || PATH="${PATH}:${candidate_bin_dir}"
9+
unset CANDIDATE_BIN_DIR
10+
}
11+

0 commit comments

Comments
 (0)