Author: nextgens
Date: 2006-07-29 16:58:15 +0000 (Sat, 29 Jul 2006)
New Revision: 9812
Modified:
trunk/apps/new_installer/res/unix/run.sh
Log:
installer: we use 1.5 if it's installed on macosx see #120
Modified: trunk/apps/new_installer/res/unix/run.sh
===================================================================
--- trunk/apps/new_installer/res/unix/run.sh 2006-07-29 16:37:24 UTC (rev
9811)
+++ trunk/apps/new_installer/res/unix/run.sh 2006-07-29 16:58:15 UTC (rev
9812)
@@ -164,6 +164,12 @@
;;
'darwin')
DIST_OS="macosx"
+
+ #We use the 1.5 jvm if it exists
+ if [ -d /System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/ ]
+ then
+ export
JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home"
+ fi
;;
'unix_sv')
DIST_OS="unixware"