aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNP-Hardass <np.hardass@gmail.com>2017-04-05 20:40:31 -0400
committerNP-Hardass <np.hardass@gmail.com>2017-04-05 20:41:19 -0400
commit4b47617b1b8c6e75342a3844b98860c518a05a37 (patch)
tree09faae6fb195554919b6dd1bb59c4691006e9d14
parentwine.eselect: Update bin links to fix calls to variant (diff)
downloadeselect-wine-4b47617b1b8c6e75342a3844b98860c518a05a37.tar.gz
eselect-wine-4b47617b1b8c6e75342a3844b98860c518a05a37.tar.bz2
eselect-wine-4b47617b1b8c6e75342a3844b98860c518a05a37.zip
wine.eselect: Update are_symlinks_valid for new bin symlinks
-rw-r--r--wine.eselect9
1 files changed, 8 insertions, 1 deletions
diff --git a/wine.eselect b/wine.eselect
index 00097c0..6639789 100644
--- a/wine.eselect
+++ b/wine.eselect
@@ -114,8 +114,15 @@ are_symlinks_valid() {
local file=$(canonicalise ${symlink})
if [[ ! -e "${file}" ]]; then
die -q "${symlink} points to nonexistant ${file}"
+ # Handle bin separately because symlinks don't go to wine_${var}
+ elif [[ "${var}" == "bin" ]]; then
+ local path="/usr/bin/${symlink##*/}${tgt#wine}"
+ if [[ "${file}" != "${path}" ]]; then
+ write_error_msg "${symlink} points to ${file}"
+ die -q "which doesn't appear to be the proper link"
+ fi
else
- path=wine_${var}
+ local path=wine_${var}
path=${!path}
path=$(canonicalise "${path}")
if [[ "${file}" != "${path%/}"/* ]]; then