summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-10-05 10:35:53 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-10-05 10:35:53 +0000
commit45a1fa6a379f4a1ab5c9eee047b373861f65723b (patch)
tree454e0ec23e0c3c6dfa328bbaaca568e17d13670b /dev-java/sun-jre-bin
parentstable x86, bug 194496 (diff)
downloadgentoo-2-45a1fa6a379f4a1ab5c9eee047b373861f65723b.tar.gz
gentoo-2-45a1fa6a379f4a1ab5c9eee047b373861f65723b.tar.bz2
gentoo-2-45a1fa6a379f4a1ab5c9eee047b373861f65723b.zip
Add quoting for variables.
(Portage version: 2.1.3.9)
Diffstat (limited to 'dev-java/sun-jre-bin')
-rw-r--r--dev-java/sun-jre-bin/ChangeLog7
-rw-r--r--dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild16
-rw-r--r--dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild4
-rw-r--r--dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild10
4 files changed, 21 insertions, 16 deletions
diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 1cb88bb237b2..4934dec54faf 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/sun-jre-bin
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.111 2007/10/04 18:44:41 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.112 2007/10/05 10:35:53 betelgeuse Exp $
+
+ 05 Oct 2007; Petteri Räty <betelgeuse@gentoo.org>
+ sun-jre-bin-1.4.2.16.ebuild, sun-jre-bin-1.5.0.13.ebuild,
+ sun-jre-bin-1.6.0.03.ebuild:
+ Add quoting for variables.
04 Oct 2007; Christian Faulhammer <opfer@gentoo.org>
sun-jre-bin-1.6.0.03.ebuild:
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild
index 70b5f25084e2..3dd87621dc43 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild,v 1.2 2007/10/04 18:36:36 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild,v 1.3 2007/10/05 10:35:53 betelgeuse Exp $
inherit eutils pax-utils java-vm-2
@@ -102,17 +102,17 @@ src_install() {
# create dir for system preferences
dodir /opt/${P}/.systemPrefs
# Create files used as storage for system preferences.
- touch ${D}/opt/${P}/.systemPrefs/.system.lock
- chmod 644 ${D}/opt/${P}/.systemPrefs/.system.lock
- touch ${D}/opt/${P}/.systemPrefs/.systemRootModFile
- chmod 644 ${D}/opt/${P}/.systemPrefs/.systemRootModFile
+ touch "${D}/opt/${P}/.systemPrefs/.system.lock"
+ chmod 644 "${D}/opt/${P}/.systemPrefs/.system.lock"
+ touch "${D}/opt/${P}/.systemPrefs/.systemRootModFile"
+ chmod 644 "${D}/opt/${P}/.systemPrefs/.systemRootModFile"
# install control panel for Gnome/KDE
sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
-e "s/\(Name=Java\)/\1 Control Panel/" \
- ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
- ${T}/sun_java-jre.desktop
- domenu ${T}/sun_java-jre.desktop
+ "${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \
+ "${T}/sun_java-jre.desktop"
+ domenu "${T}/sun_java-jre.desktop"
set_java_env
}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild
index 676de6fc76e8..180ec947f560 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild,v 1.2 2007/10/04 18:39:13 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild,v 1.3 2007/10/05 10:35:53 betelgeuse Exp $
inherit pax-utils eutils java-vm-2
@@ -50,7 +50,7 @@ src_unpack() {
sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack"
cd ..
- bash ${FILESDIR}/construct.sh bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
+ bash "${FILESDIR}/construct.sh" bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
}
src_install() {
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild
index 781dfcc32d3f..54b89434609c 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild,v 1.2 2007/10/04 18:44:41 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild,v 1.3 2007/10/05 10:35:53 betelgeuse Exp $
inherit versionator pax-utils eutils java-vm-2
@@ -57,7 +57,7 @@ src_unpack() {
sh ${DISTDIR}/${A} --accept-license --unpack || die "Failed to unpack"
cd ..
- bash ${FILESDIR}/construct-1.6.sh bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
+ bash "${FILESDIR}/construct-1.6.sh" bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
}
src_install() {
@@ -95,9 +95,9 @@ src_install() {
sed -e "s/\(Name=Java\)/\1 Control Panel for Sun JRE ${SLOT}/" \
-e "s#Exec=.*#Exec=/opt/${P}/bin/ControlPanel#" \
-e "s#Icon=.*#Icon=/opt/${P}/plugin/desktop/sun_java.png#" \
- ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
- ${T}/sun_jre-${SLOT}.desktop || die
- domenu ${T}/sun_jre-${SLOT}.desktop || die
+ "${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \
+ "${T}/sun_jre-${SLOT}.desktop" || die
+ domenu "${T}/sun_jre-${SLOT}.desktop" || die
fi
# bug #56444