1.1 --- a/src/os/posix/launcher/launcher.script Tue Dec 14 15:10:52 2010 -0500
1.2 +++ b/src/os/posix/launcher/launcher.script Wed Dec 15 07:11:31 2010 -0800
1.3 @@ -95,17 +95,21 @@
1.4 ;;
1.5 esac
1.6
1.7 +# Find out the absolute path to this script
1.8 +MYDIR=$(cd $(dirname $SCRIPT) && pwd)
1.9 +
1.10 +JDK=
1.11 if [ "${ALT_JAVA_HOME}" = "" ]; then
1.12 - if [ "${JAVA_HOME}" = "" ]; then
1.13 - echo "Neither ALT_JAVA_HOME nor JAVA_HOME is set. Aborting.";
1.14 - exit 1;
1.15 - else
1.16 - JDK=${JAVA_HOME%%/jre};
1.17 - fi
1.18 + source ${MYDIR}/jdkpath.sh
1.19 else
1.20 JDK=${ALT_JAVA_HOME%%/jre};
1.21 fi
1.22
1.23 +if [ "${JDK}" = "" ]; then
1.24 + echo Failed to find JDK. ALT_JAVA_HOME is not set or ./jdkpath.sh is empty or not found.
1.25 + exit 1
1.26 +fi
1.27 +
1.28 # We will set the LD_LIBRARY_PATH as follows:
1.29 # o $JVMPATH (directory portion only)
1.30 # o $JRE/lib/$ARCH
