Lines 1-54
Link Here
|
1 |
--- install.sh.orig Fri Mar 31 14:12:48 2006 |
1 |
--- install.sh.orig Fri Jun 16 12:03:46 2006 |
2 |
+++ install.sh Mon Apr 10 08:09:43 2006 |
2 |
+++ install.sh Tue Jun 20 15:24:11 2006 |
3 |
@@ -397,7 +397,7 @@ |
3 |
@@ -924,69 +924,14 @@ |
4 |
mvv='' # SunOS mv (no -v verbose option) |
|
|
5 |
;; |
6 |
|
7 |
- i[3456]86:FreeBSD|i[3456]86:NetBSD) |
8 |
+ i[3456]86:FreeBSD|amd64:FreeBSD|i[3456]86:NetBSD) |
9 |
cpf='-f' |
10 |
if test "$verbose" -gt '1' |
11 |
then |
12 |
@@ -789,7 +789,7 @@ |
13 |
debug_msg 0 "in generate_wrapper()" |
14 |
|
15 |
case "${machine}:${os}" in |
16 |
- i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) |
17 |
+ i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|amd64:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD) |
18 |
wrapper_ibmjava=" |
19 |
IBMJava2-142/jre \\ |
20 |
IBMJava2-141/jre \\ |
21 |
@@ -832,10 +832,19 @@ |
22 |
OPERA_SCRIPT_PATH=$0 |
23 |
export OPERA_SCRIPT_PATH |
24 |
|
25 |
+# Location of locale data |
26 |
+if [ -f %%LOCALBASE%%/share/compat/locale/UTF-8/LC_CTYPE ]; then |
27 |
+ PATH_LOCALE=%%LOCALBASE%%/share/compat/locale |
28 |
+ export PATH_LOCALE |
29 |
+fi |
30 |
+ |
31 |
# Location of the Opera binaries |
32 |
OPERA_BINARYDIR=${str_localdirexec} |
33 |
export OPERA_BINARYDIR |
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 |
_QTSTYLE_FROM_CMDLINE_='NO' |
41 |
@@ -887,6 +896,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 |
@@ -910,69 +922,12 @@ |
52 |
|
4 |
|
53 |
if test ! \"\${OPERA_JAVA_DIR}\"; then |
5 |
if test ! \"\${OPERA_JAVA_DIR}\"; then |
54 |
|
6 |
|
Lines 58-64
Link Here
|
58 |
- /usr/lib |
10 |
- /usr/lib |
59 |
- /usr/local |
11 |
- /usr/local |
60 |
- /opt\" |
12 |
- /opt\" |
61 |
+ PREFIXES=\"%%LOCALBASE%%\" |
13 |
+ PREFIXES=\"%%LOCALBASE%%\" |
62 |
|
14 |
|
63 |
for SUNJAVA in \\ |
15 |
for SUNJAVA in \\ |
64 |
- java-1.5.0-sun-1.5.0.06 \\ |
16 |
- java-1.5.0-sun-1.5.0.06 \\ |
Lines 119-128
Link Here
|
119 |
+ jdk1.3.1/jre \\ |
71 |
+ jdk1.3.1/jre \\ |
120 |
+ jdk1.4.2/jre \\ |
72 |
+ jdk1.4.2/jre \\ |
121 |
+ jdk1.5.0/jre \\ |
73 |
+ jdk1.5.0/jre \\ |
|
|
74 |
+ diablo-jre1.5.0 \\ |
75 |
+ diablo-jdk1.5.0/jre \\ |
122 |
; do |
76 |
; do |
123 |
for PREFIX in \${PREFIXES}; do |
77 |
for PREFIX in \${PREFIXES}; do |
124 |
if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi |
78 |
if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi |
125 |
@@ -1023,11 +978,8 @@ |
79 |
@@ -1037,11 +982,8 @@ |
126 |
|
80 |
|
127 |
# Acrobat Reader |
81 |
# Acrobat Reader |
128 |
for BINDIR in \\ |
82 |
for BINDIR in \\ |
Lines 131-142
Link Here
|
131 |
- /usr/X11R6/lib/Acrobat[45]/bin \\ |
85 |
- /usr/X11R6/lib/Acrobat[45]/bin \\ |
132 |
- /opt/Acrobat[45]/bin \\ |
86 |
- /opt/Acrobat[45]/bin \\ |
133 |
- /usr/Acrobat[45]/bin \\ |
87 |
- /usr/Acrobat[45]/bin \\ |
134 |
+ %%LOCALBASE%%/Acrobat4/bin \\ |
88 |
+ %%LOCALBASE%%/Acrobat4/bin \\ |
135 |
+ %%LOCALBASE%%/Acrobat5/bin \\ |
89 |
+ %%LOCALBASE%%/Acrobat5/bin \\ |
136 |
; do |
90 |
; do |
137 |
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi |
91 |
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi |
138 |
done |
92 |
done |
139 |
@@ -1038,12 +990,13 @@ |
93 |
@@ -1052,12 +994,13 @@ |
140 |
LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\" |
94 |
LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\" |
141 |
export LD_LIBRARY_PATH |
95 |
export LD_LIBRARY_PATH |
142 |
|
96 |
|
Lines 152-158
Link Here
|
152 |
LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\" |
106 |
LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\" |
153 |
fi |
107 |
fi |
154 |
done" |
108 |
done" |
155 |
@@ -1153,7 +1106,7 @@ |
109 |
@@ -1167,7 +1110,7 @@ |
156 |
chop "${OPERADESTDIR}" "str_localdirshare" |
110 |
chop "${OPERADESTDIR}" "str_localdirshare" |
157 |
chop "${OPERADESTDIR}" "str_localdirplugin" |
111 |
chop "${OPERADESTDIR}" "str_localdirplugin" |
158 |
|
112 |
|
Lines 161-183
Link Here
|
161 |
|
115 |
|
162 |
# Executable |
116 |
# Executable |
163 |
debug_msg 1 "Executable" |
117 |
debug_msg 1 "Executable" |
164 |
@@ -1193,15 +1146,6 @@ |
118 |
@@ -1328,41 +1271,9 @@ |
165 |
generate_wrapper |
|
|
166 |
chmod $chmodv 755 $wrapper_dir/opera |
167 |
|
168 |
- # Manual page |
169 |
- debug_msg 1 "Manual page" |
170 |
- |
171 |
- mkdir $mkdirv $mkdirp ${man_dir} |
172 |
- chmod $chmodv 755 ${man_dir} |
173 |
- mkdir $mkdirv $mkdirp ${man_dir}/man1 |
174 |
- chmod $chmodv 755 ${man_dir}/man1 |
175 |
- cp $cpv $cpf man/opera.1 ${man_dir}/man1 |
176 |
- |
177 |
# Documentation |
178 |
debug_msg 1 "Documentation" |
179 |
|
180 |
@@ -1377,44 +1321,13 @@ |
181 |
|
119 |
|
182 |
if test -z "${OPERADESTDIR}" |
120 |
if test -z "${OPERADESTDIR}" |
183 |
then |
121 |
then |
Lines 217-230
Link Here
|
217 |
- fi |
155 |
- fi |
218 |
- |
156 |
- |
219 |
if test "${bool_icons}" -ne 0 |
157 |
if test "${bool_icons}" -ne 0 |
220 |
then |
158 |
then xdg |
221 |
- xdg |
|
|
222 |
+ gnome |
223 |
+ kde 3 |
224 |
fi |
159 |
fi |
225 |
|
160 |
@@ -1573,48 +1484,43 @@ |
226 |
fi # OPERADESTDIR |
|
|
227 |
@@ -1623,48 +1536,42 @@ |
228 |
# This function searches for common gnome icon paths. |
161 |
# This function searches for common gnome icon paths. |
229 |
debug_msg 1 "in gnome()" |
162 |
debug_msg 1 "in gnome()" |
230 |
|
163 |
|
Lines 236-243
Link Here
|
236 |
- then |
169 |
- then |
237 |
- # /opt/gnome icon |
170 |
- # /opt/gnome icon |
238 |
- if test ! -d /opt/gnome/share/pixmaps/ |
171 |
- if test ! -d /opt/gnome/share/pixmaps/ |
239 |
+ # %%X11BASE%%/share/gnome icon |
172 |
+ # %%X11BASE%%/share/gnome icon |
240 |
+ if test ! -d %%X11BASE%%/share/gnome/pixmaps |
173 |
+ if test ! -d %%X11BASE%%/share/gnome/pixmaps/; |
241 |
then |
174 |
then |
242 |
- if test -w /opt/gnome/share |
175 |
- if test -w /opt/gnome/share |
243 |
+ if test -w %%X11BASE%%/share/gnome; |
176 |
+ if test -w %%X11BASE%%/share/gnome; |
Lines 245-302
Link Here
|
245 |
- mkdir $mkdirv $mkdirp /opt/gnome/share/pixmaps/ |
178 |
- mkdir $mkdirv $mkdirp /opt/gnome/share/pixmaps/ |
246 |
- chmod $chmodv 755 /opt/gnome/share/pixmaps |
179 |
- chmod $chmodv 755 /opt/gnome/share/pixmaps |
247 |
- cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm |
180 |
- cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm |
248 |
+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/pixmaps/ |
181 |
+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/pixmaps/ |
249 |
+ chmod $chmodv 755 %%X11BASE%%/share/gnome/pixmaps |
182 |
+ chmod $chmodv 755 %%X11BASE%%/share/gnome/pixmaps |
250 |
+ cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm |
183 |
+ cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm |
251 |
fi |
184 |
fi |
252 |
- elif test -w /opt/gnome/share/pixmaps |
185 |
- elif test -w /opt/gnome/share/pixmaps |
253 |
- then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm |
186 |
- then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm |
254 |
+ elif test -w %%X11BASE%%/share/gnome/pixmaps |
187 |
+ elif test -w %%X11BASE%%/share/gnome/pixmaps |
255 |
+ then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm |
188 |
+ then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm |
256 |
fi |
189 |
fi |
257 |
- # end /opt/gnome icon |
190 |
- # end /opt/gnome icon |
258 |
- |
191 |
+ # end %%X11BASE%%/share/gnome icon |
|
|
192 |
|
259 |
- # /opt/gnome link |
193 |
- # /opt/gnome link |
260 |
- if test -d /opt/gnome/share/gnome/apps/ |
194 |
- if test -d /opt/gnome/share/gnome/apps/ |
261 |
+ # end %%X11BASE%%/share/gnome icon |
195 |
+ # %%X11BASE%%/share/gnome link |
262 |
+ # %%X11BASE%%/share/gnome link |
196 |
+ if test -d %%X11BASE%%/share/gnome/apps/ |
263 |
+ if test -d %%X11BASE%%/share/gnome/apps/ |
|
|
264 |
then |
197 |
then |
265 |
- if test -d /opt/gnome/share/gnome/apps/Internet/ |
198 |
- if test -d /opt/gnome/share/gnome/apps/Internet/ |
266 |
+ if test -d %%X11BASE%%/share/gnome/apps/Internet/ |
199 |
+ if test -d %%X11BASE%%/share/gnome/apps/Internet/ |
267 |
then |
200 |
then |
268 |
- if test -w /opt/gnome/share/gnome/apps/Internet |
201 |
- if test -w /opt/gnome/share/gnome/apps/Internet |
269 |
- then generate_desktop /opt/gnome/share/gnome/apps/Internet |
202 |
- then generate_desktop /opt/gnome/share/gnome/apps/Internet |
270 |
+ if test -w %%X11BASE%%/share/gnome/apps/Internet |
203 |
+ if test -w %%X11BASE%%/share/gnome/apps/Internet |
271 |
+ then generate_desktop %%X11BASE%%/share/gnome/apps/Internet |
204 |
+ then generate_desktop %%X11BASE%%/share/gnome/apps/Internet |
272 |
fi |
205 |
fi |
273 |
- elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/ |
206 |
- elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/ |
274 |
+ elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/ |
207 |
+ elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/ |
275 |
then |
208 |
then |
276 |
- if test -w /opt/gnome/share/gnome/apps/Networking/WWW |
209 |
- if test -w /opt/gnome/share/gnome/apps/Networking/WWW |
277 |
- then generate_desktop /opt/gnome/share/gnome/apps/Networking/WWW |
210 |
- then generate_desktop /opt/gnome/share/gnome/apps/Networking/WWW |
278 |
+ if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW |
211 |
+ if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW |
279 |
+ then generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW |
212 |
+ then generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW |
280 |
fi |
213 |
fi |
281 |
- elif test -w /opt/gnome/share/gnome/apps |
214 |
- elif test -w /opt/gnome/share/gnome/apps |
282 |
+ elif test -w %%X11BASE%%/share/gnome/apps |
215 |
+ elif test -w %%X11BASE%%/share/gnome/apps |
283 |
then |
216 |
then |
284 |
- mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/ |
217 |
- mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/ |
285 |
- chmod $chmodv 755 /opt/gnome/share/gnome/apps/Internet |
218 |
- chmod $chmodv 755 /opt/gnome/share/gnome/apps/Internet |
286 |
- generate_desktop /opt/gnome/share/gnome/apps/Internet |
219 |
- generate_desktop /opt/gnome/share/gnome/apps/Internet |
287 |
+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/ |
220 |
+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/ |
288 |
+ chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet |
221 |
+ chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet |
289 |
+ generate_desktop %%X11BASE%%/share/gnome/apps/Internet |
222 |
+ generate_desktop %%X11BASE%%/share/gnome/apps/Internet |
290 |
fi |
223 |
fi |
291 |
fi |
224 |
fi |
292 |
- # end /opt/gnome link |
225 |
- # end /opt/gnome link |
293 |
- fi |
226 |
- fi |
294 |
- # end /opt/gnome share |
227 |
- # end /opt/gnome share |
295 |
+ # end %%X11BASE%%/share/gnome link |
228 |
+ # end %%X11BASE%%/share/gnome link |
296 |
|
229 |
|
297 |
elif test -d /usr/share/gnome/ |
230 |
elif test -d /usr/share/gnome/ |
298 |
then |
231 |
then |
299 |
@@ -1712,9 +1619,9 @@ |
232 |
@@ -1662,9 +1568,9 @@ |
300 |
# This function searches for common kde2 and kde 3 icon paths. |
233 |
# This function searches for common kde2 and kde 3 icon paths. |
301 |
debug_msg 1 "in kde()" |
234 |
debug_msg 1 "in kde()" |
302 |
|
235 |
|
Lines 304-354
Link Here
|
304 |
+ if test -d %%LOCALBASE%%/share; |
237 |
+ if test -d %%LOCALBASE%%/share; |
305 |
then |
238 |
then |
306 |
- DIR_HI=/opt/kde$1/share/icons/hicolor |
239 |
- DIR_HI=/opt/kde$1/share/icons/hicolor |
307 |
+ DIR_HI=%%LOCALBASE%%/share/icons/hicolor |
240 |
+ DIR_HI=%%LOCALBASE%%/share/icons/hicolor |
308 |
if test -d "$DIR_HI" -a -w "$DIR_HI" |
241 |
if test -d "$DIR_HI" -a -w "$DIR_HI" |
309 |
then |
242 |
then |
310 |
if test -d "$DIR_HI"/48x48/apps -a -w "$DIR_HI"/48x48/apps |
243 |
if test -d "$DIR_HI"/48x48/apps -a -w "$DIR_HI"/48x48/apps |
311 |
@@ -1728,7 +1635,7 @@ |
244 |
@@ -1678,7 +1584,7 @@ |
312 |
fi |
245 |
fi |
313 |
fi |
246 |
fi |
314 |
|
247 |
|
315 |
- DIR_LO=/opt/kde$1/share/icons/locolor |
248 |
- DIR_LO=/opt/kde$1/share/icons/locolor |
316 |
+ DIR_LO=%%LOCALBASE%%/share/icons/locolor |
249 |
+ DIR_LO=%%LOCALBASE%%/share/icons/locolor |
317 |
if test -d $DIR_LO -a -w $DIR_LO |
250 |
if test -d $DIR_LO -a -w $DIR_LO |
318 |
then |
251 |
then |
319 |
if test -d $DIR_LO/32x32/apps -a -w $DIR_LO/32x32/apps |
252 |
if test -d $DIR_LO/32x32/apps -a -w $DIR_LO/32x32/apps |
320 |
@@ -1742,15 +1649,15 @@ |
253 |
@@ -1692,15 +1598,15 @@ |
321 |
fi |
254 |
fi |
322 |
fi |
255 |
fi |
323 |
|
256 |
|
324 |
- if test -d /opt/kde$1/share/applnk/ |
257 |
- if test -d /opt/kde$1/share/applnk/ |
325 |
+ if test -d %%LOCALBASE%%/share/applnk/ |
258 |
+ if test -d %%LOCALBASE%%/share/applnk/ |
326 |
then |
259 |
then |
327 |
- if test ! -d /opt/kde$1/share/applnk/Internet/ -a -w /opt/kde$1/share/applnk |
260 |
- if test ! -d /opt/kde$1/share/applnk/Internet/ -a -w /opt/kde$1/share/applnk |
328 |
+ if test ! -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk |
261 |
+ if test ! -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk |
329 |
then |
262 |
then |
330 |
- mkdir $mkdirv $mkdirp /opt/kde$1/share/applnk/Internet/ |
263 |
- mkdir $mkdirv $mkdirp /opt/kde$1/share/applnk/Internet/ |
331 |
- chmod $chmodv 755 /opt/kde$1/share/applnk/Internet |
264 |
- chmod $chmodv 755 /opt/kde$1/share/applnk/Internet |
332 |
+ mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applnk/Internet/ |
265 |
+ mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applnk/Internet/ |
333 |
+ chmod $chmodv 755 %%LOCALBASE%%/share/applnk/Internet |
266 |
+ chmod $chmodv 755 %%LOCALBASE%%/share/applnk/Internet |
334 |
fi |
267 |
fi |
335 |
- if test -w /opt/kde$1/share/applnk/Internet |
268 |
- if test -w /opt/kde$1/share/applnk/Internet |
336 |
- then generate_desktop /opt/kde$1/share/applnk/Internet $1 |
269 |
- then generate_desktop /opt/kde$1/share/applnk/Internet $1 |
337 |
+ if test -w %%LOCALBASE%%/share/applnk/Internet |
270 |
+ if test -w %%LOCALBASE%%/share/applnk/Internet |
338 |
+ then generate_desktop %%LOCALBASE%%/share/applnk/Internet $1 |
271 |
+ then generate_desktop %%LOCALBASE%%/share/applnk/Internet $1 |
339 |
fi |
272 |
fi |
340 |
fi |
273 |
fi |
341 |
fi |
274 |
fi |
342 |
@@ -1866,12 +1773,8 @@ |
275 |
@@ -1784,45 +1690,9 @@ |
343 |
generate_desktop ${SHORTCUT_DIR} xdg |
276 |
} |
344 |
${UDD} |
277 |
|
345 |
else |
278 |
xdg() |
|
|
279 |
-{ # http://standards.freedesktop.org |
280 |
- UDD='' |
281 |
- for BIN_DIR in `pathdirs`; do |
282 |
- test -x ${BIN_DIR}/update-desktop-database || continue |
283 |
- UDD=${BIN_DIR}/update-desktop-database; break |
284 |
- done |
285 |
- |
286 |
- # http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html |
287 |
- if test "$UDD"; then |
288 |
- for ICON_DIR in `echo ${XDG_DATA_DIRS}:/usr/local/share:/usr/share|tr : '\012'|sed -e '/^$/d;s:$:/icons/hicolor:'` /usr/share/pixmaps/hicolor; do |
289 |
- test -d ${ICON_DIR} && break |
290 |
- done |
291 |
- |
292 |
- if test ! -d ${ICON_DIR}; then echo "Could not find icon installation directory, icons not installed." >&2 |
293 |
- elif test ! -w ${ICON_DIR}; then echo "Directory \"${ICON_DIR}\" not writable by user \"${USER}\", icons not installed." >&2 |
294 |
- else |
295 |
- for RESOLUTION in 48x48 32x32 22x22; do |
296 |
- TO_DIR=${ICON_DIR}/${RESOLUTION}/apps |
297 |
- test -d ${TO_DIR} && test -w ${TO_DIR} && cp $cpv $share_dir/images/opera_${RESOLUTION}.png ${TO_DIR}/opera.png |
298 |
- done |
299 |
- fi |
300 |
- |
301 |
- for SHORTCUT_DIR in ${XDG_DATA_HOME}/applications /usr/local/share/applications /usr/share/applications; do |
302 |
- test -d ${SHORTCUT_DIR} && break; |
303 |
- done |
304 |
- |
305 |
- if test ! -d ${SHORTCUT_DIR}; then echo "Could not find shortcut installation directory, desktop entry not installed." >&2; return |
306 |
- elif test ! -w ${SHORTCUT_DIR}; then echo "Directory \"${SHORTCUT_DIR}\" not writable by user \"${USER}\", desktop entry not installed." >&2; return |
307 |
- fi |
308 |
- generate_desktop ${SHORTCUT_DIR} xdg |
309 |
- ${UDD} |
310 |
- else |
346 |
- icons |
311 |
- icons |
347 |
gnome |
312 |
- gnome |
348 |
kde 3 |
313 |
- kde 3 |
349 |
- kde 2 |
314 |
- kde 2 |
350 |
- kde1 |
315 |
- kde1 |
351 |
- mandrake |
316 |
- mandrake |
352 |
fi |
317 |
- fi |
|
|
318 |
+{ |
319 |
+ gnome |
320 |
+ kde 3 |
353 |
} |
321 |
} |
354 |
|
322 |
|
|
|
323 |
echo test | sed -n -e 's/test//' || error 'sed' |