Lines 1-5
Link Here
|
1 |
--- install.sh.orig Mon Jan 31 16:21:15 2005 |
1 |
--- install.sh.orig Fri Feb 25 14:36:52 2005 |
2 |
+++ install.sh Wed Feb 9 12:32:04 2005 |
2 |
+++ install.sh Wed Mar 2 12:43:44 2005 |
|
|
3 |
@@ -108,8 +108,8 @@ |
4 |
|
5 |
if test ${os} = 'FreeBSD' -o ${os} = 'OpenBSD'; then |
6 |
wrapper_dir="${prefix}/bin" |
7 |
- doc_dir="${prefix}/share/doc/opera" |
8 |
- share_dir="${prefix}/share/opera" |
9 |
+ doc_dir="${prefix}/share/doc/opera" |
10 |
+ share_dir="${prefix}/share/opera" |
11 |
exec_dir="${share_dir}/bin" |
12 |
plugin_dir="${share_dir}/plugins" |
13 |
else |
3 |
@@ -373,7 +373,7 @@ |
14 |
@@ -373,7 +373,7 @@ |
4 |
mvv='' # SunOS mv (no -v verbose option) |
15 |
mvv='' # SunOS mv (no -v verbose option) |
5 |
;; |
16 |
;; |
Lines 9-15
Link Here
|
9 |
cpf='-f' |
20 |
cpf='-f' |
10 |
if test "$verbose" -gt '1'; then |
21 |
if test "$verbose" -gt '1'; then |
11 |
chmodv='-v' |
22 |
chmodv='-v' |
12 |
@@ -873,52 +873,13 @@ |
23 |
@@ -759,7 +759,7 @@ |
|
|
24 |
debug_msg 0 "in generate_wrapper()" |
25 |
|
26 |
case "${machine}:${os}" in |
27 |
- i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) |
28 |
+ i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|amd64:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) |
29 |
wrapper_ibmjava=" |
30 |
IBMJava2-142/jre \\ |
31 |
IBMJava2-141/jre \\ |
32 |
@@ -794,7 +794,7 @@ |
33 |
error 'os' |
34 |
;; |
35 |
esac |
36 |
- wrapper_file="${wrapper_dir}/opera" |
37 |
+ wrapper_file="${wrapper_dir}/opera" |
38 |
|
39 |
wrapper_contain="#!/bin/sh |
40 |
|
41 |
@@ -850,6 +850,9 @@ |
42 |
OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\" |
43 |
export OPERA_LD_PRELOAD |
44 |
|
45 |
+OPERA_PERSONALDIR=\${HOME}/.opera |
46 |
+export OPERA_PERSONALDIR |
47 |
+ |
48 |
# Native Java enviroment |
49 |
if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then |
50 |
INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\` |
51 |
@@ -873,53 +876,12 @@ |
13 |
|
52 |
|
14 |
if test ! \"\${OPERA_JAVA_DIR}\"; then |
53 |
if test ! \"\${OPERA_JAVA_DIR}\"; then |
15 |
|
54 |
|
Lines 23-29
Link Here
|
23 |
|
62 |
|
24 |
for SUNJAVA in \\ |
63 |
for SUNJAVA in \\ |
25 |
- jre1.5.0_01 \\ |
64 |
- jre1.5.0_01 \\ |
26 |
jdk1.5.0_01/jre \\ |
65 |
- jdk1.5.0_01/jre \\ |
27 |
- j2re1.4.2_06 \\ |
66 |
- j2re1.4.2_06 \\ |
28 |
- j2sdk1.4.2_06/jre \\ |
67 |
- j2sdk1.4.2_06/jre \\ |
29 |
- j2re1.4.2_04 \\ |
68 |
- j2re1.4.2_04 \\ |
Lines 48-53
Link Here
|
48 |
- j2se/1.3/jre \\ |
87 |
- j2se/1.3/jre \\ |
49 |
- j2se/jre \\ |
88 |
- j2se/jre \\ |
50 |
- jre1.3.1_15 \\ |
89 |
- jre1.3.1_15 \\ |
|
|
90 |
- jre1.3.1_04 \\ |
51 |
- jre1.3.1_02 \\ |
91 |
- jre1.3.1_02 \\ |
52 |
- jre1.3.1_01 \\ |
92 |
- jre1.3.1_01 \\ |
53 |
- j2re1.3.1 \\ |
93 |
- j2re1.3.1 \\ |
Lines 65-71
Link Here
|
65 |
; do |
105 |
; do |
66 |
for PREFIX in \${PREFIXES}; do |
106 |
for PREFIX in \${PREFIXES}; do |
67 |
if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi |
107 |
if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi |
68 |
@@ -967,11 +928,8 @@ |
108 |
@@ -970,11 +932,8 @@ |
69 |
|
109 |
|
70 |
# Acrobat Reader |
110 |
# Acrobat Reader |
71 |
for BINDIR in \\ |
111 |
for BINDIR in \\ |
Lines 79-85
Link Here
|
79 |
; do |
119 |
; do |
80 |
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi |
120 |
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi |
81 |
done |
121 |
done |
82 |
@@ -1285,36 +1243,13 @@ |
122 |
@@ -985,12 +944,13 @@ |
|
|
123 |
LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}:\${LD_LIBRARY_PATH}\" |
124 |
export LD_LIBRARY_PATH |
125 |
|
126 |
-# Spellchecker needs to find libaspell.so.15 |
127 |
+# Spellchecker needs to find libaspell.so.16 |
128 |
for LIBASPELL_DIR in \\ |
129 |
+ %%LOCALBASE%%/lib \\ |
130 |
/usr/local/lib \\ |
131 |
/opkg/lib \\ |
132 |
; do |
133 |
- if test -f \"\${LIBASPELL_DIR}/libaspell.so.15\"; then |
134 |
+ if test -f \"\${LIBASPELL_DIR}/libaspell.so.16\"; then |
135 |
LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\" |
136 |
fi |
137 |
done |
138 |
@@ -1080,7 +1040,7 @@ |
139 |
chop "${OPERADESTDIR}" "str_localdirshare" |
140 |
chop "${OPERADESTDIR}" "str_localdirplugin" |
141 |
|
142 |
- backup ${wrapper_dir}/opera opera |
143 |
+ #backup ${wrapper_dir}/opera opera |
144 |
|
145 |
# Executable |
146 |
debug_msg 1 "Executable" |
147 |
@@ -1115,7 +1075,7 @@ |
148 |
|
149 |
#cp $cpv $cpf wrapper.sh $wrapper_dir/opera |
150 |
generate_wrapper |
151 |
- chmod $chmodv 755 $wrapper_dir/opera |
152 |
+ chmod $chmodv 755 $wrapper_file |
153 |
|
154 |
# Documentation |
155 |
debug_msg 1 "Documentation" |
156 |
@@ -1288,36 +1248,13 @@ |
83 |
|
157 |
|
84 |
if test -z "${OPERADESTDIR}"; then |
158 |
if test -z "${OPERADESTDIR}"; then |
85 |
|
159 |
|
Lines 120-126
Link Here
|
120 |
|
194 |
|
121 |
fi # OPERADESTDIR |
195 |
fi # OPERADESTDIR |
122 |
|
196 |
|
123 |
@@ -1443,72 +1378,36 @@ |
197 |
@@ -1345,13 +1282,13 @@ |
|
|
198 |
{ |
199 |
# arg1 = location |
200 |
|
201 |
- wmconfig_file="${1}/opera" |
202 |
+ wmconfig_file="${1}/opera" |
203 |
|
204 |
- wmconfig_contain='opera name "Opera" |
205 |
+ wmconfig_contain='opera name "Opera" |
206 |
opera description "Opera Web Browser" |
207 |
opera icon "opera.xpm" |
208 |
opera mini-icon "opera.xpm" |
209 |
-opera exec "opera &" |
210 |
+opera exec "opera &" |
211 |
opera group "Internet"' |
212 |
|
213 |
echo "${wmconfig_contain}" > ${wmconfig_file} |
214 |
@@ -1362,12 +1299,12 @@ |
215 |
{ |
216 |
# arg1 = location |
217 |
|
218 |
- desktop_file="${1}/opera.desktop" |
219 |
+ desktop_file="${1}/opera.desktop" |
220 |
|
221 |
desktop_contain='[Desktop Entry] |
222 |
-Name=Opera |
223 |
+Name=Opera |
224 |
Comment=Web Browser |
225 |
-Exec=opera |
226 |
+Exec=opera |
227 |
Icon=opera.xpm |
228 |
Terminal=0 |
229 |
Type=Application' |
230 |
@@ -1446,72 +1383,36 @@ |
124 |
|
231 |
|
125 |
debug_msg 1 "in gnome()" |
232 |
debug_msg 1 "in gnome()" |
126 |
|
233 |
|
Lines 128-221
Link Here
|
128 |
- |
235 |
- |
129 |
- # /opt/gnome share |
236 |
- # /opt/gnome share |
130 |
- if test -d /opt/gnome/share; then |
237 |
- if test -d /opt/gnome/share; then |
131 |
- |
238 |
+ if test -d %%X11BASE%%/share/gnome/; then |
|
|
239 |
|
132 |
- # /opt/gnome icon |
240 |
- # /opt/gnome icon |
133 |
- if test ! -d /opt/gnome/share/pixmaps/; then |
241 |
- if test ! -d /opt/gnome/share/pixmaps/; then |
134 |
- if test -w /opt/gnome/share; then |
242 |
- if test -w /opt/gnome/share; then |
135 |
- mkdir $mkdirv $mkdirp /opt/gnome/share/pixmaps/ |
243 |
- mkdir $mkdirv $mkdirp /opt/gnome/share/pixmaps/ |
136 |
- chmod $chmodv 755 /opt/gnome/share/pixmaps |
244 |
- chmod $chmodv 755 /opt/gnome/share/pixmaps |
137 |
- cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm |
245 |
- cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm |
138 |
- fi |
246 |
+ # %%X11BASE%%/share/gnome icon |
|
|
247 |
+ if test ! -d %%X11BASE%%/share/gnome/pixmaps/; then |
248 |
+ if test -w %%X11BASE%%/share/gnome; then |
249 |
+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/pixmaps/ |
250 |
+ chmod $chmodv 755 %%X11BASE%%/share/gnome/pixmaps |
251 |
+ cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm |
252 |
fi |
139 |
- elif test -w /opt/gnome/share/pixmaps; then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm |
253 |
- elif test -w /opt/gnome/share/pixmaps; then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm |
140 |
- fi |
254 |
+ elif test -w %%X11BASE%%/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm |
|
|
255 |
fi |
141 |
- # end /opt/gnome icon |
256 |
- # end /opt/gnome icon |
142 |
- |
257 |
+ # end %%X11BASE%%/share/gnome icon |
|
|
258 |
|
143 |
- # /opt/gnome link |
259 |
- # /opt/gnome link |
144 |
- if test -d /opt/gnome/share/gnome/apps/; then |
260 |
- if test -d /opt/gnome/share/gnome/apps/; then |
145 |
- if test -d /opt/gnome/share/gnome/apps/Internet/; then |
261 |
- if test -d /opt/gnome/share/gnome/apps/Internet/; then |
146 |
- if test -w /opt/gnome/share/gnome/apps/Internet; then |
262 |
- if test -w /opt/gnome/share/gnome/apps/Internet; then |
147 |
- generate_desktop /opt/gnome/share/gnome/apps/Internet |
263 |
- generate_desktop /opt/gnome/share/gnome/apps/Internet |
148 |
- fi |
264 |
+ # %%X11BASE%%/share/gnome link |
|
|
265 |
+ if test -d %%X11BASE%%/share/gnome/apps/; then |
266 |
+ if test -d %%X11BASE%%/share/gnome/apps/Internet/; then |
267 |
+ if test -w %%X11BASE%%/share/gnome/apps/Internet; then |
268 |
+ generate_desktop %%X11BASE%%/share/gnome/apps/Internet |
269 |
fi |
149 |
- elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/; then |
270 |
- elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/; then |
150 |
- if test -w /opt/gnome/share/gnome/apps/Networking/WWW; then |
271 |
- if test -w /opt/gnome/share/gnome/apps/Networking/WWW; then |
151 |
- generate_desktop /opt/gnome/share/gnome/apps/Networking/WWW |
272 |
- generate_desktop /opt/gnome/share/gnome/apps/Networking/WWW |
152 |
- fi |
273 |
+ elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/; then |
|
|
274 |
+ if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW; then |
275 |
+ generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW |
276 |
fi |
153 |
- elif test -w /opt/gnome/share/gnome/apps; then |
277 |
- elif test -w /opt/gnome/share/gnome/apps; then |
154 |
- mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/ |
278 |
- mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/ |
155 |
- chmod $chmodv 755 /opt/gnome/share/gnome/apps/Internet |
279 |
- chmod $chmodv 755 /opt/gnome/share/gnome/apps/Internet |
156 |
- generate_desktop /opt/gnome/share/gnome/apps/Internet |
280 |
- generate_desktop /opt/gnome/share/gnome/apps/Internet |
157 |
- fi |
281 |
+ elif test -w %%X11BASE%%/share/gnome/apps; then |
158 |
- fi |
282 |
+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/ |
|
|
283 |
+ chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet |
284 |
+ generate_desktop %%X11BASE%%/share/gnome/apps/Internet |
285 |
fi |
286 |
fi |
159 |
- # end /opt/gnome link |
287 |
- # end /opt/gnome link |
160 |
- fi |
288 |
- fi |
161 |
- # end /opt/gnome share |
289 |
- # end /opt/gnome share |
162 |
- |
290 |
- |
163 |
- elif test -d /usr/share/gnome/; then |
291 |
- elif test -d /usr/share/gnome/; then |
164 |
+ if test -d %%X11BASE%%/share/gnome/; then |
292 |
- |
165 |
|
|
|
166 |
- # /usr/share/gnome icon |
293 |
- # /usr/share/gnome icon |
167 |
- if test ! -d /usr/share/gnome/pixmaps/; then |
294 |
- if test ! -d /usr/share/gnome/pixmaps/; then |
168 |
- if test -w /usr/share/gnome; then |
295 |
- if test -w /usr/share/gnome; then |
169 |
- mkdir $mkdirv $mkdirp /usr/share/gnome/pixmaps/ |
296 |
- mkdir $mkdirv $mkdirp /usr/share/gnome/pixmaps/ |
170 |
- chmod $chmodv 755 /usr/share/gnome/pixmaps |
297 |
- chmod $chmodv 755 /usr/share/gnome/pixmaps |
171 |
- cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm |
298 |
- cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm |
172 |
+ # %%X11BASE%%/share/gnome icon |
299 |
- fi |
173 |
+ if test ! -d %%X11BASE%%/share/gnome/pixmaps/; then |
|
|
174 |
+ if test -w %%X11BASE%%/share/gnome; then |
175 |
+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/pixmaps/ |
176 |
+ chmod $chmodv 755 %%X11BASE%%/share/gnome/pixmaps |
177 |
+ cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm |
178 |
fi |
179 |
- elif test -w /usr/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm |
300 |
- elif test -w /usr/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm |
180 |
+ elif test -w %%X11BASE%%/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm |
301 |
- fi |
181 |
fi |
|
|
182 |
- # end /usr/share/gnome icon |
302 |
- # end /usr/share/gnome icon |
183 |
+ # end %%X11BASE%%/share/gnome icon |
303 |
- |
184 |
|
|
|
185 |
- # /usr/share/gnome link |
304 |
- # /usr/share/gnome link |
186 |
- if test -d /usr/share/gnome/apps/; then |
305 |
- if test -d /usr/share/gnome/apps/; then |
187 |
- if test -d /usr/share/gnome/apps/Internet/; then |
306 |
- if test -d /usr/share/gnome/apps/Internet/; then |
188 |
- if test -w /usr/share/gnome/apps/Internet; then |
307 |
- if test -w /usr/share/gnome/apps/Internet; then |
189 |
- generate_desktop /usr/share/gnome/apps/Internet |
308 |
- generate_desktop /usr/share/gnome/apps/Internet |
190 |
+ # %%X11BASE%%/share/gnome link |
309 |
- fi |
191 |
+ if test -d %%X11BASE%%/share/gnome/apps/; then |
|
|
192 |
+ if test -d %%X11BASE%%/share/gnome/apps/Internet/; then |
193 |
+ if test -w %%X11BASE%%/share/gnome/apps/Internet; then |
194 |
+ generate_desktop %%X11BASE%%/share/gnome/apps/Internet |
195 |
fi |
196 |
- elif test -d /usr/share/gnome/apps/Networking/WWW/; then |
310 |
- elif test -d /usr/share/gnome/apps/Networking/WWW/; then |
197 |
- if test -w /usr/share/gnome/apps/Networking/WWW; then |
311 |
- if test -w /usr/share/gnome/apps/Networking/WWW; then |
198 |
- generate_desktop /usr/share/gnome/apps/Networking/WWW |
312 |
- generate_desktop /usr/share/gnome/apps/Networking/WWW |
199 |
+ elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/; then |
313 |
- fi |
200 |
+ if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW; then |
|
|
201 |
+ generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW |
202 |
fi |
203 |
- elif test -w /usr/share/gnome/apps; then |
314 |
- elif test -w /usr/share/gnome/apps; then |
204 |
- mkdir $mkdirv $mkdirp /usr/share/gnome/apps/Internet/ |
315 |
- mkdir $mkdirv $mkdirp /usr/share/gnome/apps/Internet/ |
205 |
- chmod $chmodv 755 /usr/share/gnome/apps/Internet |
316 |
- chmod $chmodv 755 /usr/share/gnome/apps/Internet |
206 |
- generate_desktop /usr/share/gnome/apps/Internet |
317 |
- generate_desktop /usr/share/gnome/apps/Internet |
207 |
+ elif test -w %%X11BASE%%/share/gnome/apps; then |
318 |
- fi |
208 |
+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/ |
319 |
- fi |
209 |
+ chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet |
|
|
210 |
+ generate_desktop %%X11BASE%%/share/gnome/apps/Internet |
211 |
fi |
212 |
fi |
213 |
- # end /usr/share/gnome link |
320 |
- # end /usr/share/gnome link |
214 |
+ # end %%X11BASE%%/share/gnome link |
321 |
+ # end %%X11BASE%%/share/gnome link |
215 |
fi |
322 |
fi |
216 |
# Add ximian here |
323 |
# Add ximian here |
217 |
} |
324 |
} |
218 |
@@ -1519,39 +1418,31 @@ |
325 |
@@ -1522,39 +1423,31 @@ |
219 |
|
326 |
|
220 |
debug_msg 1 "in kde()" |
327 |
debug_msg 1 "in kde()" |
221 |
|
328 |
|