diff options
author | Joshua Nichols <nichoj@gentoo.org> | 2006-08-25 04:04:02 +0000 |
---|---|---|
committer | Joshua Nichols <nichoj@gentoo.org> | 2006-08-25 04:04:02 +0000 |
commit | 9334c966fad31e42e215b3e9a6d3d2cdf239241c (patch) | |
tree | a2ca403fb7a172347f5e04f32d6d54209d6eb42c | |
parent | Added profile.d file (diff) | |
download | java-config-9334c966fad31e42e215b3e9a6d3d2cdf239241c.tar.gz java-config-9334c966fad31e42e215b3e9a6d3d2cdf239241c.tar.bz2 java-config-9334c966fad31e42e215b3e9a6d3d2cdf239241c.zip |
Updates to java-config-2, to export JAVAC, JDK_HOME
svn path=/projects/java-config-2/trunk/; revision=2642
-rw-r--r-- | src/java-config-2.profiled | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/java-config-2.profiled b/src/java-config-2.profiled index 4671966..045eb96 100644 --- a/src/java-config-2.profiled +++ b/src/java-config-2.profiled @@ -1,12 +1,17 @@ # 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,v 1.1 2006/08/03 02:13:58 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/Attic/java-config-2.profiled,v 1.3 2006/08/25 02:13:17 nichoj Exp $ # If we have a current-user-vm (and aren't root)... set it to JAVA_HOME -if [[ ${UID} != 0 && -L $HOME/.gentoo/java-config-2/current-user-vm ]]; then - export JAVA_HOME=$HOME/.gentoo/java-config-2/current-user-vm +gentoo_user_vm="${HOME}/.gentoo/java-config-2/current-user-vm" +gentoo_system_vm="/etc/java-config-2/current-system-vm" + +if [[ ${UID} != 0 && -L ${gentoo_user_vm} ]]; then + export JAVA_HOME=${gentoo_user_vm} # Otherwise set to the current system vm elif [[ -L /etc/java-config-2/current-system-vm ]]; then - export JAVA_HOME=/etc/java-config-2/current-system-vm + export JAVA_HOME=${gentoo_system_vm} fi -# +export JDK_HOME=${JAVA_HOME} +export JAVAC=${JDK_HOME}/bin/javac +unset gentoo_user_vm gentoo_system_vm |