From ad1f4b780196757548a81016a0c7376a00077342 Mon Sep 17 00:00:00 2001 From: NP-Hardass Date: Mon, 27 Mar 2017 18:38:55 -0400 Subject: wine.eselect: drop eval and change behavior in remove_symlinks --- wine.eselect | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wine.eselect b/wine.eselect index 158c279..1aa5f9d 100644 --- a/wine.eselect +++ b/wine.eselect @@ -115,7 +115,8 @@ are_symlinks_valid() { if [[ ! -e "${file}" ]]; then die -q "${symlink} points to nonexistant ${file}" else - eval path=\${wine_${var}} + path=wine_${var} + path=${!path} path=$(canonicalise "${path}") if [[ "${file}" != "${path%/}"/* ]]; then write_error_msg "${symlink} points to ${file}" @@ -713,7 +714,7 @@ remove_symlinks() { local symlink_vars=$(load_config "${CONFIG_DIR}/links/${v}" symlink_dirs) if [[ -z "${symlink_vars}" ]]; then - die -q "Missing listing of configured symlinks" + return 0 fi local var for var in ${symlink_vars[@]}; do -- cgit v1.2.3-65-gdbad