diff options
| author |   eroen <eroen@occam.eroen.eu> | 2015-02-10 23:03:17 +0100 |
|---|---|---|
| committer | eroen <eroen@occam.eroen.eu> | 2015-02-10 23:03:17 +0100 |
| commit | 5a73fe1ba49f49b25f6f6f6989fa6afe3ccf9762 (patch) | |
| tree | 55fe3b37aa6caffa1512d75fc3030dab0cbc9ad5 | |
| parent | add vanilla to VARIANTS (diff) | |
| download | eselect-wine-5a73fe1ba49f49b25f6f6f6989fa6afe3ccf9762.tar.gz eselect-wine-5a73fe1ba49f49b25f6f6f6989fa6afe3ccf9762.tar.bz2 eselect-wine-5a73fe1ba49f49b25f6f6f6989fa6afe3ccf9762.zip | |
Fix some variant outputv0.3_rc5
| -rw-r--r-- | wine.eselect | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/wine.eselect b/wine.eselect index 83c90b3..52c932c 100644 --- a/wine.eselect +++ b/wine.eselect @@ -293,9 +293,15 @@ do_list() { fi for (( i = 0; i < ${#targets[@]}; i++ )); do - [[ ${targets[i]} = \ - $(basename "$(canonicalise "${EROOT}${BINDIR}/wine")") ]] \ - && targets[i]=$(highlight_marker "${targets[i]}") + if [[ -n $variant ]]; then + if [[ ${targets[i]} = $(get_current_variant "$variant") ]]; then + targets[i]=$(highlight_marker "${targets[i]}") + fi + else + if [[ ${targets[i]} = $(get_current) ]]; then + targets[i]=$(highlight_marker "${targets[i]}") + fi + fi done write_numbered_list -m "(none found)" "${targets[@]}" } @@ -429,7 +435,11 @@ do_update() { if [[ -n ${wine} ]]; then v="${wine}" else - echo "Current wine is not valid, will update to newest" + if [[ -n $variant ]]; then + echo "Current wine-${variant} is not valid, will update to newest" + fi + echo "Current wine is not valid, will update to newest" + else fi fi |