diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2009-05-07 16:57:15 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2009-05-07 16:57:15 +0000 |
| commit | cba02b5957769fa8a63da8dff606f3bcd4a5ebd4 (patch) | |
| tree | ceb5a3e62b2fd8f25904f062e72121d91fff2d2f | |
| parent | Remove unnecessary "canonicalise" calls. (diff) | |
| download | emacs-tools-cba02b5957769fa8a63da8dff606f3bcd4a5ebd4.tar.gz emacs-tools-cba02b5957769fa8a63da8dff606f3bcd4a5ebd4.tar.bz2 emacs-tools-cba02b5957769fa8a63da8dff606f3bcd4a5ebd4.zip | |
Ditto for ctags module.
svn path=/eselect-emacs/; revision=1271
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | ctags.eselect | 9 |
2 files changed, 5 insertions, 5 deletions
@@ -1,5 +1,6 @@ 2009-05-07 Ulrich Mueller <ulm@gentoo.org> + * ctags.eselect (find_targets, do_show, do_update): * emacs.eselect (do_show, do_update): "canonicalise" is not necessary since "test -e" resolves symbolic links. diff --git a/ctags.eselect b/ctags.eselect index 0e3787a..9b837dd 100644 --- a/ctags.eselect +++ b/ctags.eselect @@ -39,8 +39,7 @@ find_targets() { # currently active Emacs version (selected by emacs.eselect) # The logic here is the same as in emacs.eselect, don't change it! local emacs - if [[ -L ${ROOT}${bindir}/emacs && \ - -e $(canonicalise "${ROOT}${bindir}/emacs") ]]; then + if [[ -L ${ROOT}${bindir}/emacs && -e ${ROOT}${bindir}/emacs ]]; then emacs=$(basename "$(readlink "${ROOT}${bindir}/emacs")") [[ -f ${ROOT}${bindir}/${CTAGS}-${emacs} ]] && echo "${CTAGS}-${emacs}" elif [[ -f ${ROOT}${bindir}/xemacs ]]; then @@ -121,8 +120,8 @@ do_show() { [[ $# -gt 0 ]] && die -q "Too many parameters" write_list_start "Current target of ${CTAGS} symlink:" - if [[ -L ${ROOT}${bindir}/${CTAGS} && \ - -e $(canonicalise "${ROOT}${bindir}/${CTAGS}") ]]; then + if [[ -L ${ROOT}${bindir}/${CTAGS} && -e ${ROOT}${bindir}/${CTAGS} ]] + then write_kv_list_entry \ "$(basename "$(readlink "${ROOT}${bindir}/${CTAGS}")")" "" elif [[ -e ${ROOT}${bindir}/${CTAGS} ]]; then @@ -200,7 +199,7 @@ do_update() { local current="" if [[ -L ${ROOT}${bindir}/${CTAGS} ]]; then current=$(basename "$(readlink "${ROOT}${bindir}/${CTAGS}")") - if [[ ! -e $(canonicalise "${ROOT}${bindir}/${CTAGS}") ]]; then + if [[ ! -e ${ROOT}${bindir}/${CTAGS} ]]; then # clean up dead symlinks remove_symlinks || die -q "Couldn't remove existing symlink" fi |