| 1 |
commit: 27140082a5c7f0ce57adcddf52681f556ca1fb36 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 29 22:50:36 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 2 22:54:55 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/eselect-java.git/commit/?id=27140082 |
| 7 |
|
| 8 |
Fix showing and highlighting current ecj and mvn targets (#585224) |
| 9 |
|
| 10 |
NEWS | 1 + |
| 11 |
src/modules/ecj.eselect.in | 9 +++++---- |
| 12 |
src/modules/maven.eselect.in | 9 +++++---- |
| 13 |
3 files changed, 11 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/NEWS b/NEWS |
| 16 |
index a0102aa..c85ba17 100644 |
| 17 |
--- a/NEWS |
| 18 |
+++ b/NEWS |
| 19 |
@@ -3,6 +3,7 @@ |
| 20 |
* Don't emit (unset) or (not a symlink) on stderr (#549498) |
| 21 |
* Fix mkdir die message in java-vm module |
| 22 |
* Sort java-vm targets in version order rather than alphanumeric |
| 23 |
+ * Fix showing and highlighting current ecj + mvn targets (#585224) |
| 24 |
|
| 25 |
0.3.0: |
| 26 |
|
| 27 |
|
| 28 |
diff --git a/src/modules/ecj.eselect.in b/src/modules/ecj.eselect.in |
| 29 |
index 7b6d784..353bcc5 100644 |
| 30 |
--- a/src/modules/ecj.eselect.in |
| 31 |
+++ b/src/modules/ecj.eselect.in |
| 32 |
@@ -38,8 +38,8 @@ find_target() { |
| 33 |
|
| 34 |
# determine the current target. |
| 35 |
get_target() { |
| 36 |
- local canonicalised=$(canonicalise "${ECJ}") |
| 37 |
- echo $(basename "${canonicalised}") |
| 38 |
+ local target=$(readlink "${ECJ}") |
| 39 |
+ echo ${target##*/} |
| 40 |
} |
| 41 |
|
| 42 |
### show action ### |
| 43 |
@@ -76,11 +76,12 @@ do_list() { |
| 44 |
die -q "Usage error: no parameters allowed." |
| 45 |
fi |
| 46 |
|
| 47 |
- local i targets |
| 48 |
+ local i targets target |
| 49 |
targets=( $(find_targets) ) |
| 50 |
+ target=$(get_target) |
| 51 |
|
| 52 |
for (( i = 0; i < ${#targets[@]}; i++ )); do |
| 53 |
- [[ ${targets[i]} = $(basename "$(canonicalise "${ECJ}")") ]] \ |
| 54 |
+ [[ ${targets[i]} = ${target} ]] \ |
| 55 |
&& targets[i]=$(highlight_marker "${targets[i]}") |
| 56 |
done |
| 57 |
|
| 58 |
|
| 59 |
diff --git a/src/modules/maven.eselect.in b/src/modules/maven.eselect.in |
| 60 |
index f0cf2e4..247fee7 100644 |
| 61 |
--- a/src/modules/maven.eselect.in |
| 62 |
+++ b/src/modules/maven.eselect.in |
| 63 |
@@ -41,8 +41,8 @@ remove_symlink() { |
| 64 |
|
| 65 |
# determine the current target. |
| 66 |
get_target() { |
| 67 |
- local canonicalised=$(canonicalise "${MVN}") |
| 68 |
- echo $(basename "${canonicalised}") |
| 69 |
+ local target=$(readlink "${MVN}") |
| 70 |
+ echo ${target##*/} |
| 71 |
} |
| 72 |
|
| 73 |
# set the Maven symlink. |
| 74 |
@@ -86,11 +86,12 @@ do_list() { |
| 75 |
die -q "Usage error: no parameters allowed." |
| 76 |
fi |
| 77 |
|
| 78 |
- local i targets |
| 79 |
+ local i targets target |
| 80 |
targets=( $(find_targets) ) |
| 81 |
+ target=$(get_target) |
| 82 |
|
| 83 |
for (( i = 0; i < ${#targets[@]}; i++ )); do |
| 84 |
- [[ ${targets[i]} = $(basename "$(canonicalise "${MVN}")") ]] \ |
| 85 |
+ [[ ${targets[i]} = ${target} ]] \ |
| 86 |
&& targets[i]=$(highlight_marker "${targets[i]}") |
| 87 |
done |
Archives