Commit bd960940 authored Jun 24, 2010 by Andy McFadden

Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.

Don't check STAY_OFF_MY_LAWN in set_java_home. That function already
refuses to update JAVA_HOME if it's set to something, which should
be sufficient for anybody who doesn't want the script to mess with it.

With this change, you can get the benefits of the 1.5/1.6 auto-selection
without having to suffer through window title changes.

Change-Id: I5cfc5d6fdf26a10b42b52925f877012c0506b9a5

parent c1ab82ae

envsetup.sh

+9 −11

Original line number	Diff line number	Diff line
		@@ -1068,7 +1068,6 @@ function godir () {

		# Force JAVA_HOME to point to java 1.6 if it isn't already set
		function set_java_home() {
		if [ "$STAY_OFF_MY_LAWN" = "" ]; then
		if [ ! "$JAVA_HOME" ]; then
		case `uname -s` in
		Darwin)
		@@ -1079,7 +1078,6 @@ function set_java_home() {
		;;
		esac
		fi
		fi
		}

		# determine whether arrays are zero-based (bash) or one-based (zsh)