diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2007-01-13 17:17:08 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2007-01-13 17:17:08 +0000 |
| commit | 37d5f7d3c8182178ebb8e0a831e74999a6497cd2 (patch) | |
| tree | e3b381721485492a46cb8be58bad7ffe64092d6f /dev-java/java-config/files | |
| parent | Added ~ppc wrt bug 15645 (diff) | |
| download | gentoo-2-37d5f7d3c8182178ebb8e0a831e74999a6497cd2.tar.gz gentoo-2-37d5f7d3c8182178ebb8e0a831e74999a6497cd2.tar.bz2 gentoo-2-37d5f7d3c8182178ebb8e0a831e74999a6497cd2.zip | |
fix (t)csh syntax and avoid using an undefined variable, acked by Betelgeuse on irc
(Portage version: 2.1.1-r2)
Diffstat (limited to 'dev-java/java-config/files')
| -rw-r--r-- | dev-java/java-config/files/java-config-2.profiled.csh | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/dev-java/java-config/files/java-config-2.profiled.csh b/dev-java/java-config/files/java-config-2.profiled.csh index f2957d1a622d..16f03ba11e99 100644 --- a/dev-java/java-config/files/java-config-2.profiled.csh +++ b/dev-java/java-config/files/java-config-2.profiled.csh @@ -1,19 +1,20 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled.csh,v 1.2 2007/01/13 16:36:54 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled.csh,v 1.3 2007/01/13 17:17:08 grobian Exp $ -set gentoo_user_vm="${HOME}/.gentoo/java-config-2/current-user-vm" -set gentoo_system_vm="/etc/java-config-2/current-system-vm" +set gentoo_user_vm = "${HOME}/.gentoo/java-config-2/current-user-vm" +set gentoo_system_vm = "/etc/java-config-2/current-system-vm" ## If we have a current-user-vm (and aren't root)... set it to JAVA_HOME ## Otherwise set to the current system vm -if (($uid != "0") && (-l $gentoo_user_vm)) then +if ( ( "$uid" != "0" ) && ( -l $gentoo_user_vm ) ) then setenv JAVA_HOME $gentoo_user_vm -else if (-l $gentoo_system_vm) then +else if ( -l $gentoo_system_vm ) then setenv JAVA_HOME $gentoo_system_vm endif - -setenv JDK_HOME $JAVA_HOME -setenv JAVAC ${JDK_HOME}/bin/javac unset gentoo_user_vm gentoo_system_vm +if ( $?JAVA_HOME ) then + setenv JDK_HOME $JAVA_HOME + setenv JAVAC ${JDK_HOME}/bin/javac +endif |