1 |
lack 10/04/26 02:36:14 |
2 |
|
3 |
Added: eselect-vi-1.1.7-prefix.patch |
4 |
Log: |
5 |
Patch for prefix support |
6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 app-admin/eselect-vi/files/eselect-vi-1.1.7-prefix.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/eselect-vi/files/eselect-vi-1.1.7-prefix.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/eselect-vi/files/eselect-vi-1.1.7-prefix.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: eselect-vi-1.1.7-prefix.patch |
15 |
=================================================================== |
16 |
--- vi.eselect-1.1.7.orig 2010-04-24 16:16:14.000000000 +0200 |
17 |
+++ vi.eselect-1.1.7 2010-04-24 16:20:02.000000000 +0200 |
18 |
@@ -12,13 +12,13 @@ |
19 |
find_targets() { |
20 |
local f |
21 |
for f in \ |
22 |
- "${ROOT}"/usr/bin/vim \ |
23 |
- "${ROOT}"/usr/bin/nvi \ |
24 |
- "${ROOT}"/usr/bin/elvis \ |
25 |
- "${ROOT}"/usr/bin/vile \ |
26 |
- "${ROOT}"/usr/bin/gvim \ |
27 |
- "${ROOT}"/usr/bin/xvile \ |
28 |
- "${ROOT}"/bin/busybox \ |
29 |
+ "${EROOT}"/usr/bin/vim \ |
30 |
+ "${EROOT}"/usr/bin/nvi \ |
31 |
+ "${EROOT}"/usr/bin/elvis \ |
32 |
+ "${EROOT}"/usr/bin/vile \ |
33 |
+ "${EROOT}"/usr/bin/gvim \ |
34 |
+ "${EROOT}"/usr/bin/xvile \ |
35 |
+ "${EROOT}"/bin/busybox \ |
36 |
; do |
37 |
if [[ -f "${f}" ]] ; then |
38 |
echo $(basename "${f}" ) |
39 |
@@ -28,8 +28,8 @@ |
40 |
|
41 |
# try to remove the vi, ex, view and man vi symlinks |
42 |
remove_symlinks() { |
43 |
- rm -f "${ROOT}"/usr/bin/{vi,ex,view} &>/dev/null && \ |
44 |
- rm -f "${ROOT}"/usr/share/man/man1/{vi,ex,view}.1{,.gz,.bz2,.lzma} &>/dev/null |
45 |
+ rm -f "${EROOT}"/usr/bin/{vi,ex,view} &>/dev/null && \ |
46 |
+ rm -f "${EROOT}"/usr/share/man/man1/{vi,ex,view}.1{,.gz,.bz2,.lzma} &>/dev/null |
47 |
} |
48 |
|
49 |
# set a man page symlink |
50 |
@@ -37,7 +37,7 @@ |
51 |
local target="${1}" link_name="${2}" x extension |
52 |
|
53 |
for x in ".1" ".1.bz2" ".1.gz" ".1.lzma" ; do |
54 |
- if [[ -e /usr/share/man/man1/${target}${x} ]] ; then |
55 |
+ if [[ -e ${EROOT}/usr/share/man/man1/${target}${x} ]] ; then |
56 |
extension="${x}" |
57 |
break |
58 |
fi |
59 |
@@ -49,7 +49,7 @@ |
60 |
fi |
61 |
|
62 |
ln -s "${target}${extension}" \ |
63 |
- "${ROOT}/usr/share/man/man1/${link_name}${extension}" |
64 |
+ "${EROOT}/usr/share/man/man1/${link_name}${extension}" |
65 |
} |
66 |
|
67 |
# set the vi, ex, view, and man vi symlinks |
68 |
@@ -62,9 +62,9 @@ |
69 |
|
70 |
local dir |
71 |
if [[ ${target} == "busybox" ]]; then |
72 |
- dir="${ROOT}/bin" |
73 |
+ dir="${EROOT}/bin" |
74 |
else |
75 |
- dir="${ROOT}/usr/bin" |
76 |
+ dir="${EROOT}/usr/bin" |
77 |
fi |
78 |
|
79 |
if [[ -f "${dir}/${target}" ]] ; then |
80 |
@@ -76,12 +76,12 @@ |
81 |
set_man_symlink "${target}" "view" |
82 |
|
83 |
# it's not okay if these fail |
84 |
- target=$(relative_name "${dir}/${target}" "${ROOT}/usr/bin") |
85 |
- ln -s "${target}" "${ROOT}/usr/bin/vi" \ |
86 |
+ target=$(relative_name "${dir}/${target}" "${EROOT}/usr/bin") |
87 |
+ ln -s "${target}" "${EROOT}/usr/bin/vi" \ |
88 |
|| die "Couldn't set ${target} /usr/bin/vi symlink" |
89 |
- ln -s "${target}" "${ROOT}/usr/bin/ex" \ |
90 |
+ ln -s "${target}" "${EROOT}/usr/bin/ex" \ |
91 |
|| die "Couldn't set ${target} /usr/bin/ex symlink" |
92 |
- ln -s "${target}" "${ROOT}/usr/bin/view" \ |
93 |
+ ln -s "${target}" "${EROOT}/usr/bin/view" \ |
94 |
|| die "Couldn't set ${target} /usr/bin/view symlink" |
95 |
else |
96 |
die -q "Target \"${1}\" doesn't appear to be valid!" |
97 |
@@ -98,9 +98,9 @@ |
98 |
[[ -z "${@}" ]] || die -q "Too many parameters" |
99 |
|
100 |
write_list_start "Current vi implementation:" |
101 |
- if [[ -L "${ROOT}/usr/bin/vi" ]] ; then |
102 |
- write_kv_list_entry "$(basename $(canonicalise ${ROOT}/usr/bin/vi ) )" "" |
103 |
- elif [[ -e "${ROOT}/usr/bin/vi" ]] ; then |
104 |
+ if [[ -L "${EROOT}/usr/bin/vi" ]] ; then |
105 |
+ write_kv_list_entry "$(basename $(canonicalise ${EROOT}/usr/bin/vi ) )" "" |
106 |
+ elif [[ -e "${EROOT}/usr/bin/vi" ]] ; then |
107 |
write_kv_list_entry "(not a symlink)" "" |
108 |
else |
109 |
write_kv_list_entry "(unset)" "" |
110 |
@@ -120,7 +120,7 @@ |
111 |
targets=( $(find_targets ) ) |
112 |
for (( i = 0; i < ${#targets[@]}; i++ )); do |
113 |
[[ ${targets[i]} = \ |
114 |
- $(basename "$(canonicalise "${ROOT}/usr/bin/vi")") ]] \ |
115 |
+ $(basename "$(canonicalise "${EROOT}/usr/bin/vi")") ]] \ |
116 |
&& targets[i]=$(highlight_marker "${targets[i]}") |
117 |
done |
118 |
write_list_start "Available vi implementations:" |
119 |
@@ -148,15 +148,15 @@ |
120 |
elif [[ -n "${2}" ]] ; then |
121 |
die -q "Too many parameters" |
122 |
|
123 |
- elif [[ -L "${ROOT}/usr/bin/vi" ]] ; then |
124 |
+ elif [[ -L "${EROOT}/usr/bin/vi" ]] ; then |
125 |
if ! remove_symlinks ; then |
126 |
die -q "Can't remove existing provider" |
127 |
elif ! set_symlinks "${1}" ; then |
128 |
die -q "Can't set new provider" |
129 |
fi |
130 |
|
131 |
- elif [[ -e "${ROOT}/usr/bin/vi" ]] ; then |
132 |
- die -q "Sorry, ${ROOT}/usr/bin/vi confuses me" |
133 |
+ elif [[ -e "${EROOT}/usr/bin/vi" ]] ; then |
134 |
+ die -q "Sorry, ${EROOT}/usr/bin/vi confuses me" |
135 |
|
136 |
else |
137 |
set_symlinks "${1}" || die -q "Can't set a new provider" |
138 |
@@ -177,11 +177,11 @@ |
139 |
[[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \ |
140 |
die -q "Usage error" |
141 |
|
142 |
- if [[ -L "${ROOT}/usr/bin/vi" ]] ; then |
143 |
+ if [[ -L "${EROOT}/usr/bin/vi" ]] ; then |
144 |
[[ ${1} == "--if-unset" ]] && return |
145 |
remove_symlinks || die -q "Can't remove existing link" |
146 |
fi |
147 |
- if [[ -e "${ROOT}/usr/bin/vi" ]] ; then |
148 |
+ if [[ -e "${EROOT}/usr/bin/vi" ]] ; then |
149 |
die -q "Can't set a new provider" |
150 |
elif ! [[ -z $(find_targets ) ]] ; then |
151 |
set_symlinks 1 || die -q "Can't set a new provider" |