|
Lines 1-5
Link Here
|
| 1 |
--- install.sh.orig Tue Oct 26 20:02:37 2004 |
1 |
--- install.sh.orig Tue Nov 16 15:11:43 2004 |
| 2 |
+++ install.sh Wed Oct 27 21:37:16 2004 |
2 |
+++ install.sh Tue Nov 16 15:26:04 2004 |
| 3 |
@@ -108,8 +108,8 @@ |
3 |
@@ -108,8 +108,8 @@ |
| 4 |
|
4 |
|
| 5 |
if test ${os} = 'FreeBSD' -o ${os} = 'OpenBSD'; then |
5 |
if test ${os} = 'FreeBSD' -o ${os} = 'OpenBSD'; then |
|
Lines 20-72
Link Here
|
| 20 |
cpf='-f' |
20 |
cpf='-f' |
| 21 |
if test "$verbose" -gt '1'; then |
21 |
if test "$verbose" -gt '1'; then |
| 22 |
chmodv='-v' |
22 |
chmodv='-v' |
| 23 |
@@ -758,15 +758,14 @@ |
23 |
@@ -759,7 +759,7 @@ |
| 24 |
|
|
|
| 25 |
debug_msg 0 "in generate_wrapper()" |
24 |
debug_msg 0 "in generate_wrapper()" |
| 26 |
|
25 |
|
| 27 |
- wrapper_opera_plugin_paths=" \"\${HOME}/.opera/plugins\" \\ |
|
|
| 28 |
+ wrapper_opera_plugin_paths=" \"\${HOME}/.opera-devel/plugins\" \\ |
| 29 |
${str_localdirplugin} \\ |
| 30 |
- /usr/lib/opera/plugins \\ |
| 31 |
- /usr/local/lib/opera/plugins \\ |
| 32 |
- /opt/lib/opera/plugins \\" |
| 33 |
+ %%LOCALBASE%%/share/opera/plugins \\" |
| 34 |
|
| 35 |
case "${machine}:${os}" in |
26 |
case "${machine}:${os}" in |
| 36 |
- i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) |
27 |
- i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) |
| 37 |
+ i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|amd64: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) |
| 38 |
wrapper_plugin_paths=" |
29 |
wrapper_ibmjava=" |
| 39 |
+ %%LOCALBASE%%/Acrobat[45]/Browsers/intellinux \\ |
30 |
IBMJava2-142/jre \\ |
| 40 |
/usr/local/Acrobat[45]/Browsers/intellinux \\ |
31 |
IBMJava2-141/jre \\ |
| 41 |
/usr/lib/Acrobat[45]/Browsers/intellinux \\ |
32 |
@@ -794,7 +794,7 @@ |
| 42 |
/usr/X11R6/lib/Acrobat[45]/Browsers/intellinux \\ |
33 |
error 'os' |
| 43 |
@@ -818,21 +817,13 @@ |
|
|
| 44 |
;; |
34 |
;; |
| 45 |
esac |
35 |
esac |
| 46 |
wrapper_netscape_plugin_paths=" |
|
|
| 47 |
- /usr/lib/RealPlayer8/Plugins \\ |
| 48 |
- /usr/lib/realplay/plugins \\ |
| 49 |
- /usr/lib/RealPlayer8 \\ |
| 50 |
- /usr/lib/realplay \\ |
| 51 |
+ %%LOCALBASE%%/lib/RealPlayer8/Plugins \\ |
| 52 |
+ %%X11BASE%%/lib/browser_plugins \\ |
| 53 |
\"\${HOME}/.netscape/plugins\" \\ |
| 54 |
- /opt/netscape/plugins \\ |
| 55 |
- /usr/lib/netscape/plugins \\ |
| 56 |
- /usr/local/netscape/plugins \\ |
| 57 |
- /usr/local/lib/netscape/plugins \\ |
| 58 |
- /usr/lib/mozilla/plugins \\ |
| 59 |
- /usr/lib/mozilla-1.3.1/plugins \\ |
| 60 |
- /usr/X11R6/lib/mozilla/plugins \\ |
| 61 |
+ %%LOCALBASE%%/lib/netscape-linux/plugins \\ |
| 62 |
\"${HOME}/.kde/.konqueror/nsplugins\" \\" |
| 63 |
|
| 64 |
- wrapper_file="${wrapper_dir}/opera" |
36 |
- wrapper_file="${wrapper_dir}/opera" |
| 65 |
+ wrapper_file="${wrapper_dir}/opera-devel" |
37 |
+ wrapper_file="${wrapper_dir}/opera-devel" |
| 66 |
|
38 |
|
| 67 |
wrapper_contain="#!/bin/sh |
39 |
wrapper_contain="#!/bin/sh |
| 68 |
|
40 |
|
| 69 |
@@ -876,6 +867,9 @@ |
41 |
@@ -838,6 +838,9 @@ |
| 70 |
OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\" |
42 |
OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\" |
| 71 |
export OPERA_LD_PRELOAD |
43 |
export OPERA_LD_PRELOAD |
| 72 |
|
44 |
|
|
Lines 76-82
Link Here
|
| 76 |
# Native Java enviroment |
48 |
# Native Java enviroment |
| 77 |
if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then |
49 |
if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then |
| 78 |
INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\` |
50 |
INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\` |
| 79 |
@@ -899,47 +893,12 @@ |
51 |
@@ -861,47 +864,12 @@ |
| 80 |
|
52 |
|
| 81 |
if test ! \"\${OPERA_JAVA_DIR}\"; then |
53 |
if test ! \"\${OPERA_JAVA_DIR}\"; then |
| 82 |
|
54 |
|
|
Lines 127-133
Link Here
|
| 127 |
; do |
99 |
; do |
| 128 |
for PREFIX in \${PREFIXES}; do |
100 |
for PREFIX in \${PREFIXES}; do |
| 129 |
if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi |
101 |
if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi |
| 130 |
@@ -1004,11 +963,8 @@ |
102 |
@@ -950,11 +918,8 @@ |
| 131 |
|
103 |
|
| 132 |
# Acrobat Reader |
104 |
# Acrobat Reader |
| 133 |
for BINDIR in \\ |
105 |
for BINDIR in \\ |
|
Lines 141-147
Link Here
|
| 141 |
; do |
113 |
; do |
| 142 |
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi |
114 |
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi |
| 143 |
done |
115 |
done |
| 144 |
@@ -1021,12 +977,13 @@ |
116 |
@@ -965,12 +930,13 @@ |
| 145 |
LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}:\${LD_LIBRARY_PATH}\" |
117 |
LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}:\${LD_LIBRARY_PATH}\" |
| 146 |
export LD_LIBRARY_PATH |
118 |
export LD_LIBRARY_PATH |
| 147 |
|
119 |
|
|
Lines 157-163
Link Here
|
| 157 |
LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\" |
129 |
LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\" |
| 158 |
fi |
130 |
fi |
| 159 |
done |
131 |
done |
| 160 |
@@ -1120,7 +1077,7 @@ |
132 |
@@ -1064,7 +1030,7 @@ |
| 161 |
chop "${OPERADESTDIR}" "str_localdirshare" |
133 |
chop "${OPERADESTDIR}" "str_localdirshare" |
| 162 |
chop "${OPERADESTDIR}" "str_localdirplugin" |
134 |
chop "${OPERADESTDIR}" "str_localdirplugin" |
| 163 |
|
135 |
|
|
Lines 166-172
Link Here
|
| 166 |
|
138 |
|
| 167 |
# Executable |
139 |
# Executable |
| 168 |
debug_msg 1 "Executable" |
140 |
debug_msg 1 "Executable" |
| 169 |
@@ -1155,7 +1112,7 @@ |
141 |
@@ -1099,7 +1065,7 @@ |
| 170 |
|
142 |
|
| 171 |
#cp $cpv $cpf wrapper.sh $wrapper_dir/opera |
143 |
#cp $cpv $cpf wrapper.sh $wrapper_dir/opera |
| 172 |
generate_wrapper |
144 |
generate_wrapper |
|
Lines 175-181
Link Here
|
| 175 |
|
147 |
|
| 176 |
# Documentation |
148 |
# Documentation |
| 177 |
debug_msg 1 "Documentation" |
149 |
debug_msg 1 "Documentation" |
| 178 |
@@ -1309,36 +1266,13 @@ |
150 |
@@ -1264,36 +1230,13 @@ |
| 179 |
|
151 |
|
| 180 |
if test -z "${OPERADESTDIR}"; then |
152 |
if test -z "${OPERADESTDIR}"; then |
| 181 |
|
153 |
|
|
Lines 216-222
Link Here
|
| 216 |
|
188 |
|
| 217 |
fi # OPERADESTDIR |
189 |
fi # OPERADESTDIR |
| 218 |
|
190 |
|
| 219 |
@@ -1366,13 +1300,13 @@ |
191 |
@@ -1321,13 +1264,13 @@ |
| 220 |
{ |
192 |
{ |
| 221 |
# arg1 = location |
193 |
# arg1 = location |
| 222 |
|
194 |
|
|
Lines 233-239
Link Here
|
| 233 |
opera group "Internet"' |
205 |
opera group "Internet"' |
| 234 |
|
206 |
|
| 235 |
echo "${wmconfig_contain}" > ${wmconfig_file} |
207 |
echo "${wmconfig_contain}" > ${wmconfig_file} |
| 236 |
@@ -1383,12 +1317,12 @@ |
208 |
@@ -1338,12 +1281,12 @@ |
| 237 |
{ |
209 |
{ |
| 238 |
# arg1 = location |
210 |
# arg1 = location |
| 239 |
|
211 |
|
|
Lines 249-255
Link Here
|
| 249 |
Icon=opera.xpm |
221 |
Icon=opera.xpm |
| 250 |
Terminal=0 |
222 |
Terminal=0 |
| 251 |
Type=Application' |
223 |
Type=Application' |
| 252 |
@@ -1467,72 +1401,36 @@ |
224 |
@@ -1422,72 +1365,36 @@ |
| 253 |
|
225 |
|
| 254 |
debug_msg 1 "in gnome()" |
226 |
debug_msg 1 "in gnome()" |
| 255 |
|
227 |
|
|
Lines 344-350
Link Here
|
| 344 |
fi |
316 |
fi |
| 345 |
# Add ximian here |
317 |
# Add ximian here |
| 346 |
} |
318 |
} |
| 347 |
@@ -1543,39 +1441,31 @@ |
319 |
@@ -1498,39 +1405,31 @@ |
| 348 |
|
320 |
|
| 349 |
debug_msg 1 "in kde()" |
321 |
debug_msg 1 "in kde()" |
| 350 |
|
322 |
|