|
Lines 1-5
Link Here
|
| 1 |
--- install.sh.orig Mon Nov 14 14:51:18 2005 |
1 |
--- install.sh.orig Mon Nov 14 14:51:18 2005 |
| 2 |
+++ install.sh Tue Nov 22 21:53:58 2005 |
2 |
+++ install.sh Wed Jan 25 18:59:13 2006 |
| 3 |
@@ -381,7 +381,7 @@ |
3 |
@@ -381,7 +381,7 @@ |
| 4 |
mvv='' # SunOS mv (no -v verbose option) |
4 |
mvv='' # SunOS mv (no -v verbose option) |
| 5 |
;; |
5 |
;; |
|
Lines 18-24
Link Here
|
| 18 |
wrapper_ibmjava=" |
18 |
wrapper_ibmjava=" |
| 19 |
IBMJava2-142/jre \\ |
19 |
IBMJava2-142/jre \\ |
| 20 |
IBMJava2-141/jre \\ |
20 |
IBMJava2-141/jre \\ |
| 21 |
@@ -796,6 +796,12 @@ |
21 |
@@ -796,10 +796,19 @@ |
| 22 |
|
22 |
|
| 23 |
wrapper_contain="#!/bin/sh |
23 |
wrapper_contain="#!/bin/sh |
| 24 |
|
24 |
|
|
Lines 31-37
Link Here
|
| 31 |
# Location of the Opera binaries |
31 |
# Location of the Opera binaries |
| 32 |
OPERA_BINARYDIR=${str_localdirexec} |
32 |
OPERA_BINARYDIR=${str_localdirexec} |
| 33 |
export OPERA_BINARYDIR |
33 |
export OPERA_BINARYDIR |
| 34 |
@@ -844,6 +850,9 @@ |
34 |
|
|
|
35 |
+# Make sure the compat libraries are found |
| 36 |
+test -d %%LOCALBASE%%/lib/compat/ && LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:%%LOCALBASE%%/lib/compat/\" |
| 37 |
+ |
| 38 |
# Parse commandline parameters |
| 39 |
toset= |
| 40 |
for arg |
| 41 |
@@ -844,6 +853,9 @@ |
| 35 |
OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\" |
42 |
OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\" |
| 36 |
export OPERA_LD_PRELOAD |
43 |
export OPERA_LD_PRELOAD |
| 37 |
|
44 |
|
|
Lines 41-47
Link Here
|
| 41 |
# Native Java enviroment |
48 |
# Native Java enviroment |
| 42 |
if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then |
49 |
if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then |
| 43 |
INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\` |
50 |
INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\` |
| 44 |
@@ -867,65 +876,12 @@ |
51 |
@@ -867,65 +879,12 @@ |
| 45 |
|
52 |
|
| 46 |
if test ! \"\${OPERA_JAVA_DIR}\"; then |
53 |
if test ! \"\${OPERA_JAVA_DIR}\"; then |
| 47 |
|
54 |
|
|
Lines 110-116
Link Here
|
| 110 |
; do |
117 |
; do |
| 111 |
for PREFIX in \${PREFIXES}; do |
118 |
for PREFIX in \${PREFIXES}; do |
| 112 |
if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi |
119 |
if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi |
| 113 |
@@ -976,11 +932,8 @@ |
120 |
@@ -976,11 +935,8 @@ |
| 114 |
|
121 |
|
| 115 |
# Acrobat Reader |
122 |
# Acrobat Reader |
| 116 |
for BINDIR in \\ |
123 |
for BINDIR in \\ |
|
Lines 124-130
Link Here
|
| 124 |
; do |
131 |
; do |
| 125 |
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi |
132 |
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi |
| 126 |
done |
133 |
done |
| 127 |
@@ -991,12 +944,13 @@ |
134 |
@@ -991,12 +947,13 @@ |
| 128 |
LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\" |
135 |
LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\" |
| 129 |
export LD_LIBRARY_PATH |
136 |
export LD_LIBRARY_PATH |
| 130 |
|
137 |
|
|
Lines 140-146
Link Here
|
| 140 |
LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\" |
147 |
LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\" |
| 141 |
fi |
148 |
fi |
| 142 |
done |
149 |
done |
| 143 |
@@ -1086,7 +1040,7 @@ |
150 |
@@ -1086,7 +1043,7 @@ |
| 144 |
chop "${OPERADESTDIR}" "str_localdirshare" |
151 |
chop "${OPERADESTDIR}" "str_localdirshare" |
| 145 |
chop "${OPERADESTDIR}" "str_localdirplugin" |
152 |
chop "${OPERADESTDIR}" "str_localdirplugin" |
| 146 |
|
153 |
|
|
Lines 149-155
Link Here
|
| 149 |
|
156 |
|
| 150 |
# Executable |
157 |
# Executable |
| 151 |
debug_msg 1 "Executable" |
158 |
debug_msg 1 "Executable" |
| 152 |
@@ -1300,49 +1254,13 @@ |
159 |
@@ -1300,49 +1257,13 @@ |
| 153 |
|
160 |
|
| 154 |
if test -z "${OPERADESTDIR}" |
161 |
if test -z "${OPERADESTDIR}" |
| 155 |
then |
162 |
then |
|
Lines 199-205
Link Here
|
| 199 |
fi |
206 |
fi |
| 200 |
|
207 |
|
| 201 |
fi # OPERADESTDIR |
208 |
fi # OPERADESTDIR |
| 202 |
@@ -1487,48 +1405,43 @@ |
209 |
@@ -1487,48 +1408,43 @@ |
| 203 |
# This function searches for common gnome icon paths. |
210 |
# This function searches for common gnome icon paths. |
| 204 |
debug_msg 1 "in gnome()" |
211 |
debug_msg 1 "in gnome()" |
| 205 |
|
212 |
|
|
Lines 271-277
Link Here
|
| 271 |
|
278 |
|
| 272 |
elif test -d /usr/share/gnome/ |
279 |
elif test -d /usr/share/gnome/ |
| 273 |
then |
280 |
then |
| 274 |
@@ -1576,9 +1489,9 @@ |
281 |
@@ -1576,9 +1492,9 @@ |
| 275 |
# This function searches for common kde2 and kde 3 icon paths. |
282 |
# This function searches for common kde2 and kde 3 icon paths. |
| 276 |
debug_msg 1 "in kde()" |
283 |
debug_msg 1 "in kde()" |
| 277 |
|
284 |
|
|
Lines 283-289
Link Here
|
| 283 |
if test -d "$DIR_HI" -a -w "$DIR_HI" |
290 |
if test -d "$DIR_HI" -a -w "$DIR_HI" |
| 284 |
then |
291 |
then |
| 285 |
if test -d "$DIR_HI"/48x48/apps -a -w "$DIR_HI"/48x48/apps |
292 |
if test -d "$DIR_HI"/48x48/apps -a -w "$DIR_HI"/48x48/apps |
| 286 |
@@ -1592,7 +1505,7 @@ |
293 |
@@ -1592,7 +1508,7 @@ |
| 287 |
fi |
294 |
fi |
| 288 |
fi |
295 |
fi |
| 289 |
|
296 |
|
|
Lines 292-298
Link Here
|
| 292 |
if test -d $DIR_LO -a -w $DIR_LO |
299 |
if test -d $DIR_LO -a -w $DIR_LO |
| 293 |
then |
300 |
then |
| 294 |
if test -d $DIR_LO/32x32/apps -a -w $DIR_LO/32x32/apps |
301 |
if test -d $DIR_LO/32x32/apps -a -w $DIR_LO/32x32/apps |
| 295 |
@@ -1606,15 +1519,15 @@ |
302 |
@@ -1606,15 +1522,15 @@ |
| 296 |
fi |
303 |
fi |
| 297 |
fi |
304 |
fi |
| 298 |
|
305 |
|