diff options
| author |   Danny van Dyk <kugelfang@gentoo.org> | 2006-03-04 01:10:22 +0000 |
|---|---|---|
| committer | Danny van Dyk <kugelfang@gentoo.org> | 2006-03-04 01:10:22 +0000 |
| commit | ae848333048924dd928c79ea28eaf043118ce309 (patch) | |
| tree | e3b477cfe23010fc096a4c26efb44c3fe616bc86 | |
| parent | 2006-03-01 Danny van Dyk <kugelfang@gentoo.org> (diff) | |
| download | eselect-ae848333048924dd928c79ea28eaf043118ce309.tar.gz eselect-ae848333048924dd928c79ea28eaf043118ce309.tar.bz2 eselect-ae848333048924dd928c79ea28eaf043118ce309.zip | |
2006-03-04 Danny van Dyk <kugelfang@gentoo.org>
* modules/rc.eselect: Fixed a bug in the is_script() function.
With this change the 'show' action works again.
* modules/kernel.eselect: Fixed trailing slashes in the 'show' action.
diffstat:
modules/kernel.eselect | 2 +-
modules/rc.eselect | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
svn path=/trunk/; revision=253
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | modules/kernel.eselect | 2 | ||||
| -rw-r--r-- | modules/rc.eselect | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,5 +1,11 @@ ChangeLog for eselect +2006-03-04 Danny van Dyk <kugelfang@gentoo.org> + + * modules/rc.eselect: Fixed a bug in the is_script() function. + With this change the 'show' action works again. + * modules/kernel.eselect: Fixed trailing slashes in the 'show' action. + 2006-03-01 Danny van Dyk <kugelfang@gentoo.org> * modules/env.eselect: Fixed bug #124472. env.eselect now uses a diff --git a/modules/kernel.eselect b/modules/kernel.eselect index 07d1dc2..863e0da 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 )" "" + write_kv_list_entry "$(readlink ${ROOT}/usr/src/linux | tr -d / )" "" else write_kv_list_entry "(unset)" "" fi diff --git a/modules/rc.eselect b/modules/rc.eselect index dd4fa8b..f1d4512 100644 --- a/modules/rc.eselect +++ b/modules/rc.eselect @@ -30,7 +30,7 @@ is_script() { [[ -n ${file} ]] \ || return 1 ( [[ -L ${file} ]] \ - && [[ ! -e $(dirname ${file})/$(readlink ${file}) ]] ) \ + && [[ ! -e $(readlink -f ${file}) ]] ) \ && return 1 [[ -e ${file} ]] \ && [[ ${file%%.sh} == ${file} ]] \ |