From fee5dfae46193cf8151c3490aee1e73a10ad4573 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 02 May 2007 20:36:11 +0000
Subject: [PATCH] fixed bug where upgrade does not function if started outside current directory
---
opends/resource/upgrade | 10 +++++-----
opends/resource/upgrade.bat | 15 +++++++--------
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/opends/resource/upgrade b/opends/resource/upgrade
index 9db6ea2..9448181 100644
--- a/opends/resource/upgrade
+++ b/opends/resource/upgrade
@@ -125,9 +125,9 @@
fi
fi
-if [ -r "./tmp/upgrade" ]
+if [ -r "${INSTANCE_ROOT}/tmp/upgrade" ]
then
- rm -fr "./tmp/upgrade"
+ rm -fr "${INSTANCE_ROOT}/tmp/upgrade"
fi
# Launch the build extractor.
@@ -144,7 +144,7 @@
if test ${?} -eq 0
then
- if [ -r "./tmp/upgrade" ]
+ if [ -r "${INSTANCE_ROOT}/tmp/upgrade" ]
then
# Configure the appropriate CLASSPATH.
@@ -159,9 +159,9 @@
"${JAVA_BIN}" org.opends.quicksetup.upgrader.UpgradeLauncher "${@}"
# Clean up if necessary
- if [ -r "./tmp/upgrade" ]
+ if [ -r "${INSTANCE_ROOT}/tmp/upgrade" ]
then
- rm -fr "./tmp/upgrade"
+ rm -fr "${INSTANCE_ROOT}/tmp/upgrade"
fi
else
JAVAWS_VM_ARGS="-Dorg.opends.quicksetup.upgrader.Root=$INSTANCE_ROOT"
diff --git a/opends/resource/upgrade.bat b/opends/resource/upgrade.bat
index 7063a83..d29353f 100644
--- a/opends/resource/upgrade.bat
+++ b/opends/resource/upgrade.bat
@@ -44,8 +44,8 @@
goto callExtractor
:noJavaHome
-if not exist "%DIR_HOME%\lib\set-java-home.bat" goto noSetJavaHome
-call "%DIR_HOME%\lib\set-java-home.bat"
+if not exist "%INSTANCE_ROOT%\lib\set-java-home.bat" goto noSetJavaHome
+call "%INSTANCE_ROOT%\lib\set-java-home.bat"
set JAVA_BIN=%JAVA_HOME%\bin\java.exe
set jAVAWS_BIN=%JAVA_HOME%\bin\javaws.exe
if "%*" == "" goto callWebStartUpgrade
@@ -71,25 +71,24 @@
:callExtractor
-if EXIST .\tmp\upgrade rd .\tmp\upgrade /s /q
+if EXIST %INSTANCE_ROOT%\tmp\upgrade rd %INSTANCE_ROOT%\tmp\upgrade /s /q
set CLASSPATH=""
-FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\lib\setcp.bat" %%x
+FOR %%x in ("%INSTANCE_ROOT%\lib\*.jar") DO call "%INSTANCE_ROOT%\lib\setcp.bat" %%x
"%JAVA_BIN%" org.opends.quicksetup.upgrader.BuildExtractor %*
if %ERRORLEVEL%==0 goto callUpgrader
goto end
:callWebStartUpgrade
-set JAVAWS_VM_ARGS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -Dorg.opends.quicksetup.upgrader.Root="%DIR_HOME%"
-rem set JAVAWS_VM_ARGS=-Dorg.opends.quicksetup.upgrader.Root="%DIR_HOME%"
+rem set JAVAWS_VM_ARGS=-Dorg.opends.quicksetup.upgrader.Root="%INSTANCE_ROOT%"
if "%OPENDS_UPGRADE_JNLP%" == "" set OPENDS_UPGRADE_JNLP=http://build.opends.org/install/QuickUpgrade.jnlp
"%JAVAWS_BIN%" "%OPENDS_UPGRADE_JNLP%"
goto end
:callUpgrader
set CLASSPATH=""
-FOR %%x in ("%DIR_HOME%\tmp\upgrade\lib\*.jar") DO call "%DIR_HOME%\lib\setcp.bat" %%x
+FOR %%x in ("%INSTANCE_ROOT%\tmp\upgrade\lib\*.jar") DO call "%INSTANCE_ROOT%\lib\setcp.bat" %%x
"%JAVA_BIN%" org.opends.quicksetup.upgrader.UpgradeLauncher %*
-if EXIST .\tmp\upgrade rd .\tmp\upgrade /s /q
+if EXIST %INSTANCE_ROOT%\tmp\upgrade rd %INSTANCE_ROOT%\tmp\upgrade /s /q
goto end
:end
--
Gitblit v1.10.0