1 |
betelgeuse 07/10/05 10:42:44 |
2 |
|
3 |
Modified: ChangeLog sun-jdk-1.4.2.16.ebuild |
4 |
Log: |
5 |
Add quoting for variables. |
6 |
(Portage version: 2.1.3.9) |
7 |
|
8 |
Revision Changes Path |
9 |
1.218 dev-java/sun-jdk/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.218&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.218&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?r1=1.217&r2=1.218 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v |
18 |
retrieving revision 1.217 |
19 |
retrieving revision 1.218 |
20 |
diff -u -r1.217 -r1.218 |
21 |
--- ChangeLog 4 Oct 2007 18:34:30 -0000 1.217 |
22 |
+++ ChangeLog 5 Oct 2007 10:42:44 -0000 1.218 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for dev-java/sun-jdk |
25 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.217 2007/10/04 18:34:30 opfer Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.218 2007/10/05 10:42:44 betelgeuse Exp $ |
28 |
+ |
29 |
+ 05 Oct 2007; Petteri Räty <betelgeuse@g.o> |
30 |
+ sun-jdk-1.4.2.16.ebuild: |
31 |
+ Add quoting for variables. |
32 |
|
33 |
04 Oct 2007; Christian Faulhammer <opfer@g.o> |
34 |
sun-jdk-1.6.0.03.ebuild: |
35 |
|
36 |
|
37 |
|
38 |
1.3 dev-java/sun-jdk/sun-jdk-1.4.2.16.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.16.ebuild?rev=1.3&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.16.ebuild?rev=1.3&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.16.ebuild?r1=1.2&r2=1.3 |
43 |
|
44 |
Index: sun-jdk-1.4.2.16.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.16.ebuild,v |
47 |
retrieving revision 1.2 |
48 |
retrieving revision 1.3 |
49 |
diff -u -r1.2 -r1.3 |
50 |
--- sun-jdk-1.4.2.16.ebuild 4 Oct 2007 18:29:56 -0000 1.2 |
51 |
+++ sun-jdk-1.4.2.16.ebuild 5 Oct 2007 10:42:44 -0000 1.3 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2007 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.16.ebuild,v 1.2 2007/10/04 18:29:56 opfer Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.16.ebuild,v 1.3 2007/10/05 10:42:44 betelgeuse Exp $ |
57 |
|
58 |
JAVA_SUPPORTS_GENERATION_1="true" |
59 |
inherit pax-utils java-vm-2 eutils |
60 |
@@ -64,23 +64,23 @@ |
61 |
} |
62 |
|
63 |
src_unpack() { |
64 |
- if [ ! -r ${DISTDIR}/${At} ]; then |
65 |
+ if [ ! -r "${DISTDIR}/${At}" ]; then |
66 |
die "cannot read ${At}.bin. Please check the permission and try again." |
67 |
fi |
68 |
if use jce; then |
69 |
- if [ ! -r ${DISTDIR}/${jce_policy} ]; then |
70 |
+ if [ ! -r "${DISTDIR}/${jce_policy}" ]; then |
71 |
die "cannot read ${jce_policy}. Please check the permission and try again." |
72 |
fi |
73 |
fi |
74 |
#Search for the ELF Header |
75 |
testExp=$(echo -e '\0177\0105\0114\0106\0001\0001\0001') |
76 |
startAt=`grep -aonm 1 ${testExp} ${DISTDIR}/${At} | cut -d: -f1` |
77 |
- tail -n +${startAt} ${DISTDIR}/${At} > install.sfx |
78 |
+ tail -n +${startAt} "${DISTDIR}/${At}" > install.sfx |
79 |
chmod +x install.sfx |
80 |
./install.sfx || die |
81 |
rm install.sfx |
82 |
|
83 |
- if [ -f ${S}/lib/unpack ]; then |
84 |
+ if [[ -f ${S}/lib/unpack ]]; then |
85 |
UNPACK_CMD=${S}/lib/unpack |
86 |
chmod +x $UNPACK_CMD |
87 |
sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD |
88 |
@@ -111,7 +111,7 @@ |
89 |
dodoc COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt || die |
90 |
dohtml README.html || die |
91 |
if use examples; then |
92 |
- cp -pPR demo ${D}/opt/${P}/ || die |
93 |
+ cp -pPR demo "${D}/opt/${P}/" || die |
94 |
fi |
95 |
|
96 |
cp -pPR src.zip "${D}/opt/${P}/" || die |
97 |
@@ -120,12 +120,14 @@ |
98 |
# Using unlimited jce while still retaining the strong jce |
99 |
# May have repercussions when you find you cannot symlink libraries |
100 |
# in classpaths. |
101 |
- cd ${D}/opt/${P}/jre/lib/security |
102 |
- unzip ${DISTDIR}/${jce_policy} |
103 |
+ cd "${D}/opt/${P}/jre/lib/security" |
104 |
+ unzip "${DISTDIR}/${jce_policy}" |
105 |
mv jce unlimited-jce |
106 |
dodir /opt/${P}/jre/lib/security/strong-jce |
107 |
- mv ${D}/opt/${P}/jre/lib/security/US_export_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce |
108 |
- mv ${D}/opt/${P}/jre/lib/security/local_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce |
109 |
+ mv "${D}/opt/${P}/jre/lib/security/US_export_policy.jar" \ |
110 |
+ "${D}/opt/${P}/jre/lib/security/strong-jce" || die |
111 |
+ mv "${D}/opt/${P}/jre/lib/security/local_policy.jar" \ |
112 |
+ "${D}/opt/${P}/jre/lib/security/strong-jce" || die |
113 |
dosym /opt/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/ |
114 |
dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ |
115 |
fi |
116 |
@@ -146,18 +148,18 @@ |
117 |
# create dir for system preferences |
118 |
dodir /opt/${P}/.systemPrefs |
119 |
# Create files used as storage for system preferences. |
120 |
- touch ${D}/opt/${P}/.systemPrefs/.system.lock |
121 |
- chmod 644 ${D}/opt/${P}/.systemPrefs/.system.lock |
122 |
- touch ${D}/opt/${P}/.systemPrefs/.systemRootModFile |
123 |
- chmod 644 ${D}/opt/${P}/.systemPrefs/.systemRootModFile |
124 |
+ touch "${D}/opt/${P}/.systemPrefs/.system.lock" |
125 |
+ chmod 644 "${D}/opt/${P}/.systemPrefs/.system.lock" |
126 |
+ touch "${D}/opt/${P}/.systemPrefs/.systemRootModFile" |
127 |
+ chmod 644 "${D}/opt/${P}/.systemPrefs/.systemRootModFile" |
128 |
|
129 |
# install control panel for Gnome/KDE |
130 |
sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \ |
131 |
-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \ |
132 |
- ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \ |
133 |
- ${T}/sun_java-${SLOT}.desktop |
134 |
+ "${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop" > \ |
135 |
+ "${T}/sun_java-${SLOT}.desktop" |
136 |
|
137 |
- domenu ${T}/sun_java-${SLOT}.desktop |
138 |
+ domenu "${T}/sun_java-${SLOT}.desktop" |
139 |
|
140 |
set_java_env |
141 |
} |
142 |
|
143 |
|
144 |
|
145 |
-- |
146 |
gentoo-commits@g.o mailing list |