diff options
author | Ulrich Müller <ulm@gentoo.org> | 2014-03-13 14:20:02 +0100 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2014-03-13 14:20:02 +0100 |
commit | 039c9ba08fb383286120aa1d6de8f2861b77f08f (patch) | |
tree | d83b425a6e354852d0994c48cfe56fa5a8972e12 | |
parent | Rename variable "extension" to "suffix" throughout. Adjust quoting. (diff) | |
download | emacs-tools-039c9ba08fb383286120aa1d6de8f2861b77f08f.tar.gz emacs-tools-039c9ba08fb383286120aa1d6de8f2861b77f08f.tar.bz2 emacs-tools-039c9ba08fb383286120aa1d6de8f2861b77f08f.zip |
Recognise man pages named like the main binary as emacs.1 targets.
* emacs.eselect (MANPAGELIST): Now equal to BINARYLIST.
(remove_symlinks): Explicitly include "emacs" in for loops.
(set_symlinks): Also recognise man pages named like the main
binary as possible targets for the emacs.1 symlink.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | emacs.eselect | 20 |
2 files changed, 20 insertions, 7 deletions
@@ -1,3 +1,10 @@ +2014-03-13 Ulrich Müller <ulm@gentoo.org> + + * emacs.eselect (MANPAGELIST): Now equal to BINARYLIST. + (remove_symlinks): Explicitly include "emacs" in for loops. + (set_symlinks): Also recognise man pages named like the main + binary as possible targets for the emacs.1 symlink. + 2014-02-17 Ulrich Müller <ulm@gentoo.org> * Version 1.15 released. diff --git a/emacs.eselect b/emacs.eselect index 2c656b7..524c4c3 100644 --- a/emacs.eselect +++ b/emacs.eselect @@ -26,7 +26,7 @@ VERSION="1.15" # ctags and etags are handled in their own module BINARYLIST="emacsclient b2m ebrowse rcs-checkin grep-changelog" -MANPAGELIST="emacs emacsclient b2m ebrowse rcs-checkin grep-changelog" +MANPAGELIST="${BINARYLIST}" MANPAGELIST_OLD="gfdl" find_targets() { @@ -52,12 +52,11 @@ remove_symlinks() { # Remove existing symlinks to binaries, man pages, # and the env file (own function) local f - rm -f "${EROOT}/usr/bin/emacs" - for f in ${BINARYLIST}; do + for f in emacs ${BINARYLIST}; do rm -f "${EROOT}/usr/bin/${f}" done - for f in ${MANPAGELIST} ${MANPAGELIST_OLD}; do - rm -f "${EROOT}"/usr/share/man/man1/${f}.1* + for f in emacs ${MANPAGELIST} ${MANPAGELIST_OLD}; do + rm -f "${EROOT}/usr/share/man/man1/${f}.1"* done remove_infopath } @@ -77,7 +76,7 @@ set_bin_symlinks() { set_man_symlinks() { # Set symlinks to man pages local target=$1 suffix f i - for f in ${MANPAGELIST}; do + for f in emacs ${MANPAGELIST}; do for i in "${EROOT}/usr/share/man/man1/${f}-${target}.1"*; do if [[ -f ${i} ]]; then # target file exists; determine compression suffix @@ -91,7 +90,7 @@ set_man_symlinks() { set_symlinks() { # Set symlinks to binaries and man pages, update info path - local target=$1 nomain=$2 targets + local target=$1 nomain=$2 targets suffix i # target may be specified by its name or its index if is_number "${target}"; then # numeric index, find the target's name @@ -112,6 +111,13 @@ set_symlinks() { if [[ -z ${nomain} ]]; then ln -s "${target}" "${EROOT}/usr/bin/emacs" \ || die "Couldn't set ${target} ${EROOT}/usr/bin/emacs symlink" + for i in "${EROOT}/usr/share/man/man1/${target}.1"*; do + if [[ -f ${i} ]]; then + suffix=${i##*/"${target}.1"} + ln -s "${target}.1${suffix}" \ + "${EROOT}/usr/share/man/man1/emacs.1${suffix}" + fi + done fi set_bin_symlinks "${target}" set_man_symlinks "${target}" |