From f22ba1b0628e415ce428a2569b30e2fddf305533 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 23 May 2007 01:18:09 +0000
Subject: [PATCH] corrected some problems with Windows upgrade script
---
opendj-sdk/opends/resource/upgrade.bat | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opends/resource/upgrade.bat b/opendj-sdk/opends/resource/upgrade.bat
index 8ba3a5c..1d1a7a8 100644
--- a/opendj-sdk/opends/resource/upgrade.bat
+++ b/opendj-sdk/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
--
Gitblit v1.10.0