| 1 |
Author: ulm |
| 2 |
Date: 2010-02-26 21:13:00 +0000 (Fri, 26 Feb 2010) |
| 3 |
New Revision: 766 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/extern/ChangeLog |
| 7 |
trunk/extern/modules/vi.eselect |
| 8 |
Log: |
| 9 |
Fix handling of ROOT in symlinks, bug 260593. |
| 10 |
|
| 11 |
Modified: trunk/extern/ChangeLog |
| 12 |
=================================================================== |
| 13 |
--- trunk/extern/ChangeLog 2010-02-16 22:41:25 UTC (rev 765) |
| 14 |
+++ trunk/extern/ChangeLog 2010-02-26 21:13:00 UTC (rev 766) |
| 15 |
@@ -1,3 +1,8 @@ |
| 16 |
+2010-02-26 Ulrich Mueller <ulm@g.o> |
| 17 |
+ |
| 18 |
+ * modules/vi.eselect (set_symlinks): Fix handling of ROOT in |
| 19 |
+ symlinks, bug 260593. |
| 20 |
+ |
| 21 |
2010-02-03 Ryan Hill <dirtyepic@g.o> |
| 22 |
|
| 23 |
* AUTHORS: Add myself. |
| 24 |
|
| 25 |
Modified: trunk/extern/modules/vi.eselect |
| 26 |
=================================================================== |
| 27 |
--- trunk/extern/modules/vi.eselect 2010-02-16 22:41:25 UTC (rev 765) |
| 28 |
+++ trunk/extern/modules/vi.eselect 2010-02-26 21:13:00 UTC (rev 766) |
| 29 |
@@ -1,5 +1,5 @@ |
| 30 |
# -*-eselect-*- vim: ft=eselect |
| 31 |
-# Copyright 1999-2009 Gentoo Foundation |
| 32 |
+# Copyright 1999-2010 Gentoo Foundation |
| 33 |
# Distributed under the terms of the GNU General Public License v2 |
| 34 |
# $Id$ |
| 35 |
|
| 36 |
@@ -57,7 +57,7 @@ |
| 37 |
local target="${1}" targets |
| 38 |
if is_number "${target}" && [[ ${target} -ge 1 ]] ; then |
| 39 |
targets=( $(find_targets ) ) |
| 40 |
- target=${targets[$(( ${target} - 1 ))]} |
| 41 |
+ target=${targets[target-1]} |
| 42 |
fi |
| 43 |
|
| 44 |
local dir |
| 45 |
@@ -76,12 +76,13 @@ |
| 46 |
set_man_symlink "${target}" "view" |
| 47 |
|
| 48 |
# it's not okay if these fail |
| 49 |
- ln -s "${dir}/${target}" "${ROOT}/usr/bin/vi" || \ |
| 50 |
- die "Couldn't set ${target} /usr/bin/vi symlink" |
| 51 |
- ln -s "${dir}/${target}" "${ROOT}/usr/bin/ex" || \ |
| 52 |
- die "Couldn't set ${target} /usr/bin/ex symlink" |
| 53 |
- ln -s "${dir}/${target}" "${ROOT}/usr/bin/view" || \ |
| 54 |
- die "Couldn't set ${target} /usr/bin/view symlink" |
| 55 |
+ target=$(relative_name "${dir}/${target}" "${ROOT}/usr/bin") |
| 56 |
+ ln -s "${target}" "${ROOT}/usr/bin/vi" \ |
| 57 |
+ || die "Couldn't set ${target} /usr/bin/vi symlink" |
| 58 |
+ ln -s "${target}" "${ROOT}/usr/bin/ex" \ |
| 59 |
+ || die "Couldn't set ${target} /usr/bin/ex symlink" |
| 60 |
+ ln -s "${target}" "${ROOT}/usr/bin/view" \ |
| 61 |
+ || die "Couldn't set ${target} /usr/bin/view symlink" |
| 62 |
else |
| 63 |
die -q "Target \"${1}\" doesn't appear to be valid!" |
| 64 |
fi |
Archives