diff options
5 files changed, 19 insertions, 13 deletions
diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog index 5e33815cbefa..4c1c7f615461 100644 --- a/app-emulation/emul-linux-x86-java/ChangeLog +++ b/app-emulation/emul-linux-x86-java/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/emul-linux-x86-java # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.21 2007/02/11 22:47:48 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.22 2007/03/07 22:04:42 wolf31o2 Exp $ + + 07 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> + emul-linux-x86-java-1.4.2.03-r2.ebuild, + emul-linux-x86-java-1.5.0.10.ebuild, emul-linux-x86-java-1.5.0.11.ebuild, + emul-linux-x86-java-1.6.0.ebuild: + Change all instances of [ to [[. *emul-linux-x86-java-1.5.0.11 (11 Feb 2007) diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild index 20a6b0bc09f9..f9c37708ae64 100644 --- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild +++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.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/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild,v 1.2 2007/01/23 10:50:33 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild,v 1.3 2007/03/07 22:04:42 wolf31o2 Exp $ inherit multilib java-vm-2 versionator @@ -37,7 +37,7 @@ RESTRICT="nostrip" # Extract the 'skip' value (offset of tarball) we should pass to tail get_offset() { - [ ! -f "$1" ] && return + [[ ! -f "$1" ]] && return local offset="`gawk ' /^[[:space:]]*skip[[:space:]]*=/ { @@ -55,7 +55,7 @@ get_offset() { src_unpack () { local offset="`get_offset ${DISTDIR}/${A}`" - if [ -z "${offset}" ] ; then + if [[ -z "${offset}" ]] ; then eerror "Failed to get offset of tarball!" die "Failed to get offset of tarball!" fi @@ -68,16 +68,16 @@ unpack_jars() { # New to 1.4.2 local PACKED_JARS="lib/tools.jar lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar" local UNPACK_CMD="" - if [ -f "$JAVAHOME/lib/unpack" ]; then + if [[ -f "$JAVAHOME/lib/unpack" ]]; then UNPACK_CMD="$JAVAHOME/lib/unpack" chmod +x "$UNPACK_CMD" #packerror="" sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD for i in $PACKED_JARS; do - if [ -f "$JAVAHOME/${i%.jar}.pack" ]; then + if [[ -f "$JAVAHOME/${i%.jar}.pack" ]]; then einfo "Creating ${JAVAHOME}/${i}" "$UNPACK_CMD" "$JAVAHOME/${i%.jar}.pack" "$JAVAHOME/$i" - if [ ! -f "$JAVAHOME/$i" ]; then + if [[ ! -f "$JAVAHOME/$i" ]]; then die "Failed to unpack jar files ${i}." # Please refer\n" #ewarn "to the Troubleshooting section of the Installation\n" #ewarn "Instructions on the download page for more information.n" diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.10.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.10.ebuild index 87c12b11401b..5240596d01ae 100644 --- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.10.ebuild +++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.10.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/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.10.ebuild,v 1.2 2007/02/03 05:17:53 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.10.ebuild,v 1.3 2007/03/07 22:04:42 wolf31o2 Exp $ inherit java-vm-2 eutils @@ -47,7 +47,7 @@ QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so opt/${P}/lib/i386/libdeploy.so" src_unpack() { - if [ ! -r ${DISTDIR}/${At} ]; then + if [[ ! -r ${DISTDIR}/${At} ]]; then die "cannot read ${At}. Please check the permission and try again." fi diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild index 7380b455f390..3fef720f62aa 100644 --- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild +++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.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/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild,v 1.1 2007/02/11 22:47:48 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild,v 1.2 2007/03/07 22:04:42 wolf31o2 Exp $ inherit java-vm-2 eutils @@ -47,7 +47,7 @@ QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so opt/${P}/lib/i386/libdeploy.so" src_unpack() { - if [ ! -r ${DISTDIR}/${At} ]; then + if [[ ! -r ${DISTDIR}/${At} ]]; then die "cannot read ${At}. Please check the permission and try again." fi diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild index 5c703b2f2b79..89ece38b6db5 100644 --- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild +++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.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/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild,v 1.2 2007/02/11 22:32:24 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild,v 1.3 2007/03/07 22:04:42 wolf31o2 Exp $ inherit java-vm-2 eutils @@ -50,7 +50,7 @@ QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so opt/${P}/lib/i386/server/libjvm.so" src_unpack() { - if [ ! -r ${DISTDIR}/${At} ]; then + if [[ ! -r ${DISTDIR}/${At} ]]; then die "cannot read ${At}. Please check the permission and try again." fi |