diff options
author | NP-Hardass <np.hardass@gmail.com> | 2017-03-27 18:38:55 -0400 |
---|---|---|
committer | NP-Hardass <np.hardass@gmail.com> | 2017-03-27 18:38:55 -0400 |
commit | ad1f4b780196757548a81016a0c7376a00077342 (patch) | |
tree | c474c2515c33fcc4f1cccaabe7bc740f39d93dbd | |
parent | wine.eselect: re-arrange code so less io calls are made (diff) | |
download | eselect-wine-0.99_rc7.tar.gz eselect-wine-0.99_rc7.tar.bz2 eselect-wine-0.99_rc7.zip |
wine.eselect: drop eval and change behavior in remove_symlinksv0.99_rc7
-rw-r--r-- | wine.eselect | 5 |
1 files 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 |