diff options
| author |   Alistair Bush <ali_bush@gentoo.org> | 2010-03-03 08:50:53 +0000 |
|---|---|---|
| committer | Alistair Bush <ali_bush@gentoo.org> | 2010-03-03 08:50:53 +0000 |
| commit | 3cf09b795301bb02b53d438483180ecf68b511bf (patch) | |
| tree | 4e37d0afe80caa6c41bc57c65102be379f11642e /dev-util/eclipse-sdk | |
| parent | Mask dev-lang/squeak wrt #247363. (diff) | |
| download | gentoo-2-3cf09b795301bb02b53d438483180ecf68b511bf.tar.gz gentoo-2-3cf09b795301bb02b53d438483180ecf68b511bf.tar.bz2 gentoo-2-3cf09b795301bb02b53d438483180ecf68b511bf.zip | |
Make shell script POSIX compliant. Thanks for patch from Michał Górny <gentoo@mgorny.alt.pl>
(Portage version: 2.1.7.17/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/eclipse-sdk')
| -rw-r--r-- | dev-util/eclipse-sdk/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/eclipse-sdk/files/3.5/eclipse-3.5 | 17 |
2 files changed, 15 insertions, 8 deletions
diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog index 5b81674750e9..a9cadbbf6343 100644 --- a/dev-util/eclipse-sdk/ChangeLog +++ b/dev-util/eclipse-sdk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/eclipse-sdk # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.151 2010/02/09 10:57:02 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.152 2010/03/03 08:50:52 ali_bush Exp $ + + 03 Mar 2010; Alistair Bush <ali_bush@gentoo.org> files/3.5/eclipse-3.5: + Make shell script POSIX compliant. Thanks for patch from Michał Górny + <gentoo@mgorny.alt.pl> 09 Feb 2010; Alistair Bush <ali_bush@gentoo.org> +files/3.5/jvmarg.patch, eclipse-sdk-3.5.1.ebuild: diff --git a/dev-util/eclipse-sdk/files/3.5/eclipse-3.5 b/dev-util/eclipse-sdk/files/3.5/eclipse-3.5 index c1be21de4df8..f50a51ad629d 100644 --- a/dev-util/eclipse-sdk/files/3.5/eclipse-3.5 +++ b/dev-util/eclipse-sdk/files/3.5/eclipse-3.5 @@ -11,24 +11,27 @@ SLOT="3.5" -[ -f "/etc/eclipserc-${SLOT}" ] && source "/etc/eclipserc-${SLOT}" -[ -f "$HOME/gentoo/.eclipserc" ] && source "$HOME/gentoo/.eclipserc" +[ -f "/etc/eclipserc-${SLOT}" ] && . "/etc/eclipserc-${SLOT}" +[ -f "$HOME/gentoo/.eclipserc" ] && . "$HOME/gentoo/.eclipserc" ECLIPSE_HOME=${ECLIPSE_HOME:="/usr/lib/eclipse-${SLOT}"} ECLIPSE_BIN="${ECLIPSE_HOME}/eclipse" if [ ! -x "${ECLIPSE_BIN}" ] ; then echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr - exit -1 + exit 1 fi if [ $(id -u) -eq 0 ] ; then - echo "Do not run eclipse as root user! Exiting ..." - exit -1 + echo "Do not run eclipse as root user! Exiting ..." > /dev/stderr + exit 1 fi -[[ "$(java-config -f)" =~ "gcj" ]] \ - && export JAVA_PKG_CLASSMAP="${ECLIPSE_HOME}/eclipse.gcjdb" +case "$(java-config -f)" in + *gcj*) + export JAVA_PKG_CLASSMAP="${ECLIPSE_HOME}/eclipse.gcjdb" + ;; +esac eval $(gjl --package "swt-${SLOT}" --get-args) |