diff options
author | Danny van Dyk <kugelfang@gentoo.org> | 2006-03-30 21:11:55 +0000 |
---|---|---|
committer | Danny van Dyk <kugelfang@gentoo.org> | 2006-03-30 21:11:55 +0000 |
commit | cf91797e1fcb8bd75eb0b9f1b94cda1f1367d5ca (patch) | |
tree | 38cf8ce4e275c378196b7883b75e5320095f9e74 /modules/kernel.eselect | |
parent | $ (diff) | |
download | eselect-cf91797e1fcb8bd75eb0b9f1b94cda1f1367d5ca.tar.gz eselect-cf91797e1fcb8bd75eb0b9f1b94cda1f1367d5ca.tar.bz2 eselect-cf91797e1fcb8bd75eb0b9f1b94cda1f1367d5ca.zip |
2006-03-30 Danny van Dyk <kugelfang@gentoo.org>
* modules/binutils.eselect: Cleaned up the Coding Style a bit.
* libs/path-manipulation.bash.in, doc/developer-guide.txt,
configure.ac: Added support for the canonicalise function, a wrapper
to either GNU readlink or realpath.
* modules/binutils.eselect, modules/blas.eselect,
modules/config.eselect, modules/env.eselect, modules/kernel.eselect,
modules/lapack.eselect, modules/mailer.eselect,
modules/oracle.eselect, modules/profile.eselect, modules/rc.eselect,
modules/ruby.eselect, modules/vi.eselect: Converted to use
canonicalise() instead of readlink -f. This ensure portability of
eselect to *BSD.
diffstat:
configure.ac | 16 ++++++++++++++++
doc/developer-guide.txt | 9 ++++++++-
libs/Makefile.am | 2 +-
libs/path-manipulation.bash.in | 4 ++++
modules/binutils.eselect | 9 +++++----
modules/blas.eselect | 10 +++++-----
modules/config.eselect | 2 +-
modules/env.eselect | 10 +++++-----
modules/kernel.eselect | 4 ++--
modules/lapack.eselect | 8 ++++----
modules/mailer.eselect | 4 ++--
modules/oracle.eselect | 9 ++++++---
modules/profile.eselect | 4 ++--
modules/rc.eselect | 2 +-
modules/ruby.eselect | 2 +-
modules/vi.eselect | 4 ++--
16 files changed, 65 insertions(+), 34 deletions(-)
svn path=/trunk/; revision=261
Diffstat (limited to 'modules/kernel.eselect')
-rw-r--r-- | modules/kernel.eselect | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/kernel.eselect b/modules/kernel.eselect index 863e0da..af6b40d 100644 --- a/modules/kernel.eselect +++ b/modules/kernel.eselect @@ -46,7 +46,7 @@ describe_show() { do_show() { write_list_start "Current kernel symlink:" if [[ -L "${ROOT}/usr/src/linux" ]] ; then - write_kv_list_entry "$(readlink ${ROOT}/usr/src/linux | tr -d / )" "" + write_kv_list_entry "$(canonicalise ${ROOT}/usr/src/linux | tr -d / )" "" else write_kv_list_entry "(unset)" "" fi @@ -64,7 +64,7 @@ do_list() { if [[ -n ${targets[@]} ]] ; then local i for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do - [[ ${targets[${i}]} == $(readlink ${ROOT}/usr/src/linux ) ]] && \ + [[ ${targets[${i}]} == $(canonicalise ${ROOT}/usr/src/linux ) ]] && \ targets[${i}]="${targets[${i}]} $(highlight '*' )" done write_numbered_list "${targets[@]}" |