corrected some problems with Windows upgrade script

kenneth_suter

23.18.2007 206af823156e4af8a1ddb05b8ec9607c0e1f59a2

corrected some problems with Windows upgrade script

 opends/resource/upgrade.bat

@@ -32,14 +32,12 @@

:checkJavaBin
if "%JAVA_BIN%" == "" goto noJavaBin
if "%*" == "" goto callWebStartUpgrade
goto callExtractor

:noJavaBin
if "%JAVA_HOME%" == "" goto noJavaHome
if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
set JAVA_BIN=%JAVA_HOME%\bin\java.exe
if "%*" == "" goto callWebStartUpgrade
goto callExtractor

:noJavaHome
@@ -66,18 +64,15 @@
"%JAVA_BIN%" org.opends.server.tools.InstallDS -t > NUL 2>&1
if not %errorlevel% == 0 goto noValidJavaHome

if "%*" == "" goto callWebStartUpgrade


:callExtractor
if EXIST %INSTANCE_ROOT%\tmp\upgrade rd %INSTANCE_ROOT%\tmp\upgrade /s /q
if EXIST "%INSTANCE_ROOT%\tmp\upgrade" rd "%INSTANCE_ROOT%\tmp\upgrade" /s /q
set CLASSPATH=""
FOR %%x in ("%INSTANCE_ROOT%\lib\*.jar") DO call "%INSTANCE_ROOT%\lib\setcp.bat" %%x
"%JAVA_BIN%" org.opends.quicksetup.upgrader.BuildExtractor %*
goto prepUpgrader

:prepUpgrader
if EXIST %INSTANCE_ROOT%\tmp\upgrade goto setClassPathToStageDir
if EXIST "%INSTANCE_ROOT%\tmp\upgrade" goto setClassPathToStageDir
goto callUpgrader

:setClassPathToStageDir
@@ -87,7 +82,6 @@

:callUpgrader
"%JAVA_BIN%" org.opends.quicksetup.upgrader.UpgradeLauncher %*
if EXIST %INSTANCE_ROOT%\tmp\upgrade rd %INSTANCE_ROOT%\tmp\upgrade /s /q
goto end

:end