|
Lines 1-5
Link Here
|
| 1 |
--- install.sh.orig Fri Dec 10 13:53:57 2004 |
1 |
--- install.sh.orig Mon Jan 31 16:21:15 2005 |
| 2 |
+++ install.sh Wed Dec 15 15:35:18 2004 |
2 |
+++ install.sh Wed Feb 9 12:32:04 2005 |
| 3 |
@@ -373,7 +373,7 @@ |
3 |
@@ -373,7 +373,7 @@ |
| 4 |
mvv='' # SunOS mv (no -v verbose option) |
4 |
mvv='' # SunOS mv (no -v verbose option) |
| 5 |
;; |
5 |
;; |
|
Lines 9-15
Link Here
|
| 9 |
cpf='-f' |
9 |
cpf='-f' |
| 10 |
if test "$verbose" -gt '1'; then |
10 |
if test "$verbose" -gt '1'; then |
| 11 |
chmodv='-v' |
11 |
chmodv='-v' |
| 12 |
@@ -873,47 +873,12 @@ |
12 |
@@ -873,52 +873,13 @@ |
| 13 |
|
13 |
|
| 14 |
if test ! \"\${OPERA_JAVA_DIR}\"; then |
14 |
if test ! \"\${OPERA_JAVA_DIR}\"; then |
| 15 |
|
15 |
|
|
Lines 22-27
Link Here
|
| 22 |
+ PREFIXES=\"%%LOCALBASE%%\" |
22 |
+ PREFIXES=\"%%LOCALBASE%%\" |
| 23 |
|
23 |
|
| 24 |
for SUNJAVA in \\ |
24 |
for SUNJAVA in \\ |
|
|
25 |
- jre1.5.0_01 \\ |
| 26 |
jdk1.5.0_01/jre \\ |
| 27 |
- j2re1.4.2_06 \\ |
| 28 |
- j2sdk1.4.2_06/jre \\ |
| 25 |
- j2re1.4.2_04 \\ |
29 |
- j2re1.4.2_04 \\ |
| 26 |
- j2sdk1.4.2_04/jre \\ |
30 |
- j2sdk1.4.2_04/jre \\ |
| 27 |
- j2re1.4.2_03 \\ |
31 |
- j2re1.4.2_03 \\ |
|
Lines 43-48
Link Here
|
| 43 |
- j2se/1.4/jre \\ |
47 |
- j2se/1.4/jre \\ |
| 44 |
- j2se/1.3/jre \\ |
48 |
- j2se/1.3/jre \\ |
| 45 |
- j2se/jre \\ |
49 |
- j2se/jre \\ |
|
|
50 |
- jre1.3.1_15 \\ |
| 46 |
- jre1.3.1_02 \\ |
51 |
- jre1.3.1_02 \\ |
| 47 |
- jre1.3.1_01 \\ |
52 |
- jre1.3.1_01 \\ |
| 48 |
- j2re1.3.1 \\ |
53 |
- j2re1.3.1 \\ |
|
Lines 60-66
Link Here
|
| 60 |
; do |
65 |
; do |
| 61 |
for PREFIX in \${PREFIXES}; do |
66 |
for PREFIX in \${PREFIXES}; do |
| 62 |
if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi |
67 |
if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi |
| 63 |
@@ -962,11 +927,8 @@ |
68 |
@@ -967,11 +928,8 @@ |
| 64 |
|
69 |
|
| 65 |
# Acrobat Reader |
70 |
# Acrobat Reader |
| 66 |
for BINDIR in \\ |
71 |
for BINDIR in \\ |
|
Lines 74-80
Link Here
|
| 74 |
; do |
79 |
; do |
| 75 |
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi |
80 |
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi |
| 76 |
done |
81 |
done |
| 77 |
@@ -1281,36 +1243,13 @@ |
82 |
@@ -1285,36 +1243,13 @@ |
| 78 |
|
83 |
|
| 79 |
if test -z "${OPERADESTDIR}"; then |
84 |
if test -z "${OPERADESTDIR}"; then |
| 80 |
|
85 |
|
|
Lines 115-121
Link Here
|
| 115 |
|
120 |
|
| 116 |
fi # OPERADESTDIR |
121 |
fi # OPERADESTDIR |
| 117 |
|
122 |
|
| 118 |
@@ -1439,72 +1378,36 @@ |
123 |
@@ -1443,72 +1378,36 @@ |
| 119 |
|
124 |
|
| 120 |
debug_msg 1 "in gnome()" |
125 |
debug_msg 1 "in gnome()" |
| 121 |
|
126 |
|
|
Lines 210-216
Link Here
|
| 210 |
fi |
215 |
fi |
| 211 |
# Add ximian here |
216 |
# Add ximian here |
| 212 |
} |
217 |
} |
| 213 |
@@ -1515,39 +1418,31 @@ |
218 |
@@ -1519,39 +1418,31 @@ |
| 214 |
|
219 |
|
| 215 |
debug_msg 1 "in kde()" |
220 |
debug_msg 1 "in kde()" |