From c40f084a6d3e897785f2fbff3ddb97545644cddc Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 11 Dec 2006 15:34:39 +0000
Subject: [PATCH] The following modifications include the comments from Neil and Brian (thanks to both for your help):

---
 opends/resource/setup.bat |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/opends/resource/setup.bat b/opends/resource/setup.bat
index 7806468..825263e 100644
--- a/opends/resource/setup.bat
+++ b/opends/resource/setup.bat
@@ -30,6 +30,7 @@
 set DIR_HOME=%~dP0
 set INSTANCE_ROOT=%DIR_HOME%
 
+:checkJavaBin
 if "%JAVA_BIN%" == "" goto noJavaBin
 goto setClassPath
 
@@ -38,7 +39,14 @@
 if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
 set JAVA_BIN=%JAVA_HOME%\bin\java.exe
 goto setClassPath
+
 :noJavaHome
+if not exist "%DIR_HOME%\bin\set-java-home.bat" goto noSetJavaHome
+call "%DIR_HOME%\bin\set-java-home.bat"
+set JAVA_BIN=%JAVA_HOME%\bin\java.exe
+goto setClassPath
+
+:noSetJavaHome
 echo Error: JAVA_HOME environment variable is not set.
 echo        Please set it to a valid Java 5 installation.
 goto end
@@ -49,7 +57,7 @@
 
 set PATH=%SystemRoot%
 
-"%JAVA_BIN%" %JAVA_ARGS% org.opends.quicksetup.SetupLauncher -P setup.bat %*
+"%JAVA_BIN%" %JAVA_ARGS% org.opends.quicksetup.installer.InstallLauncher -P setup.bat %*
 
 
 :end

--
Gitblit v1.10.0