|
Lines 1-6
Link Here
|
| 1 |
--- install.sh.orig Thu Oct 2 14:24:57 2003 |
1 |
--- install.sh.orig Mon Oct 6 15:01:39 2003 |
| 2 |
+++ install.sh Thu Oct 2 18:11:45 2003 |
2 |
+++ install.sh Wed Oct 8 22:36:31 2003 |
| 3 |
@@ -728,9 +728,7 @@ |
3 |
@@ -760,9 +760,7 @@ |
| 4 |
|
4 |
|
| 5 |
wrapper_opera_plugin_paths=" \"\${HOME}/.opera/plugins\" \\ |
5 |
wrapper_opera_plugin_paths=" \"\${HOME}/.opera/plugins\" \\ |
| 6 |
${str_localdirplugin} \\ |
6 |
${str_localdirplugin} \\ |
|
Lines 11-25
Link Here
|
| 11 |
|
11 |
|
| 12 |
case "${machine}:${os}" in |
12 |
case "${machine}:${os}" in |
| 13 |
i[3456]86:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) |
13 |
i[3456]86:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) |
| 14 |
@@ -744,7 +742,6 @@ |
14 |
@@ -817,15 +815,10 @@ |
| 15 |
/usr/java/jre1.4.0/plugin/i386/ns4 \\ |
|
|
| 16 |
/usr/java/jre1.3.1/plugin/i386/ns4 \\ |
| 17 |
/usr/lib/j2re1.3/plugin/i386/netscape4 \\ |
| 18 |
- /usr/local/jdk1.3.1/jre/plugin/i386/ns4 \\ |
| 19 |
/usr/local/linux-jdk1.3.1/jre/plugin/i386/ns4 \\" |
| 20 |
wrapper_ibmjava=" |
| 21 |
IBMJava2-141/jre \\ |
| 22 |
@@ -796,15 +793,10 @@ |
| 23 |
;; |
15 |
;; |
| 24 |
esac |
16 |
esac |
| 25 |
wrapper_netscape_plugin_paths=" |
17 |
wrapper_netscape_plugin_paths=" |
|
Lines 38-44
Link Here
|
| 38 |
|
30 |
|
| 39 |
wrapper_file="${wrapper_dir}/opera" |
31 |
wrapper_file="${wrapper_dir}/opera" |
| 40 |
|
32 |
|
| 41 |
@@ -960,11 +952,8 @@ |
33 |
@@ -981,11 +974,8 @@ |
| 42 |
|
34 |
|
| 43 |
# Acrobat Reader |
35 |
# Acrobat Reader |
| 44 |
for BINDIR in \\ |
36 |
for BINDIR in \\ |
|
Lines 52-60
Link Here
|
| 52 |
; do |
44 |
; do |
| 53 |
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi |
45 |
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi |
| 54 |
done |
46 |
done |
| 55 |
@@ -1222,44 +1211,6 @@ |
47 |
@@ -1243,29 +1233,6 @@ |
| 56 |
|
48 |
|
| 57 |
if test "${bool_destdir}" = "no"; then |
49 |
if test -z "${OPERADESTDIR}"; then |
| 58 |
|
50 |
|
| 59 |
- # System wide configuration files |
51 |
- # System wide configuration files |
| 60 |
- config_dir='/usr/local/etc' |
52 |
- config_dir='/usr/local/etc' |
|
Lines 64-90
Link Here
|
| 64 |
- echo " $config_dir/opera6rc" |
56 |
- echo " $config_dir/opera6rc" |
| 65 |
- echo " $config_dir/opera6rc.fixed" |
57 |
- echo " $config_dir/opera6rc.fixed" |
| 66 |
- echo " cannot be prefixed" |
58 |
- echo " cannot be prefixed" |
| 67 |
- echo "Do you want to install them [y,n | yes,no]?" |
59 |
- if con_firm "Do you want to install them"; then |
| 68 |
- while true; do |
60 |
- backup $config_dir/opera6rc opera6rc config |
| 69 |
- read install_config |
61 |
- backup $config_dir/opera6rc.fixed opera6rc.fixed config |
| 70 |
- case "${install_config}" in |
62 |
- cp $cpv $cpf config/opera6rc $config_dir |
| 71 |
- |
63 |
- cp $cpv $cpf config/opera6rc.fixed $config_dir |
| 72 |
- ''|[yY]|[yY][eE][sS]) |
64 |
- fi |
| 73 |
- backup $config_dir/opera6rc opera6rc config |
|
|
| 74 |
- backup $config_dir/opera6rc.fixed opera6rc.fixed config |
| 75 |
- cp $cpv $cpf config/opera6rc $config_dir |
| 76 |
- cp $cpv $cpf config/opera6rc.fixed $config_dir |
| 77 |
- break |
| 78 |
- ;; |
| 79 |
- |
| 80 |
- [nN]|[nN][oO]) |
| 81 |
- break |
| 82 |
- ;; |
| 83 |
- *) |
| 84 |
- echo 'Invalid answer, try again:' |
| 85 |
- ;; |
| 86 |
- esac |
| 87 |
- done |
| 88 |
- else |
65 |
- else |
| 89 |
- echo |
66 |
- echo |
| 90 |
- echo "User \"${USERNAME}\" does not have write access to $config_dir" |
67 |
- echo "User \"${USERNAME}\" does not have write access to $config_dir" |
|
Lines 97-103
Link Here
|
| 97 |
# Shorcuts and Icons |
74 |
# Shorcuts and Icons |
| 98 |
icons |
75 |
icons |
| 99 |
gnome |
76 |
gnome |
| 100 |
@@ -1350,22 +1301,22 @@ |
77 |
@@ -1356,22 +1323,22 @@ |
| 101 |
|
78 |
|
| 102 |
debug_msg 0 "in icons()" |
79 |
debug_msg 0 "in icons()" |
| 103 |
|
80 |
|
|
Lines 132-138
Link Here
|
| 132 |
fi |
109 |
fi |
| 133 |
|
110 |
|
| 134 |
if test ! -d /etc/X11/wmconfig/; then |
111 |
if test ! -d /etc/X11/wmconfig/; then |
| 135 |
@@ -1431,33 +1382,33 @@ |
112 |
@@ -1437,33 +1404,33 @@ |
| 136 |
fi |
113 |
fi |
| 137 |
# end /opt/gnome share |
114 |
# end /opt/gnome share |
| 138 |
|
115 |
|
|
Lines 187-193
Link Here
|
| 187 |
fi |
164 |
fi |
| 188 |
fi |
165 |
fi |
| 189 |
# end /usr/share/gnome link |
166 |
# end /usr/share/gnome link |
| 190 |
@@ -1497,12 +1448,12 @@ |
167 |
@@ -1503,12 +1470,12 @@ |
| 191 |
|
168 |
|
| 192 |
fi |
169 |
fi |
| 193 |
|
170 |
|
|
Lines 205-211
Link Here
|
| 205 |
fi |
182 |
fi |
| 206 |
} |
183 |
} |
| 207 |
|
184 |
|
| 208 |
@@ -1526,8 +1477,8 @@ |
185 |
@@ -1532,8 +1499,8 @@ |
| 209 |
fi |
186 |
fi |
| 210 |
if test -w /opt/kde/share/applnk/Internet; then generate_desktop /opt/kde/share/applnk/Internet; fi |
187 |
if test -w /opt/kde/share/applnk/Internet; then generate_desktop /opt/kde/share/applnk/Internet; fi |