From d8cab401b5ca457d70ed8afbbffa71b7e13f59bb Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Fri, 13 Apr 2007 20:11:48 +0000
Subject: [PATCH] aligns classpath setting between *nix and Windows
---
opends/resource/upgrade | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/opends/resource/upgrade b/opends/resource/upgrade
index ded1a18..b8b2872 100644
--- a/opends/resource/upgrade
+++ b/opends/resource/upgrade
@@ -123,11 +123,37 @@
then
rm -fr "./tmp/upgrade"
fi
+
# Launch the build extractor.
+# Configure the appropriate CLASSPATH.
+# BuildExtractor uses the existing install's
+# jars
+CLASSPATH=${CLASSPATH}:${INSTANCE_ROOT}/classes
+for JAR in ${INSTANCE_ROOT}/lib/*.jar
+do
+ CLASSPATH=${CLASSPATH}:${JAR}
+done
+export CLASSPATH
"${JAVA_BIN}" org.opends.quicksetup.upgrader.BuildExtractor "${@}"
if test ${?} -eq 0
then
+ # Configure the appropriate CLASSPATH.
+ # Unlike BuildExtractor, the Upgrader uses
+ # the newly extracted build's jars.
+ CLASSPATH=${INSTANCE_ROOT}/tmp/upgrade/classes
+ for JAR in ${INSTANCE_ROOT}/tmp/upgrade/lib/*.jar
+ do
+ CLASSPATH=${CLASSPATH}:${JAR}
+ done
+ export CLASSPATH
+ echo ${CLASSPATH}
# Launch the upgrade process.
"${JAVA_BIN}" org.opends.quicksetup.upgrader.UpgradeLauncher "${@}"
+
+ # Clean up if necessary
+ if [ -r "./tmp/upgrade" ]
+ then
+ rm -fr "./tmp/upgrade"
+ fi
fi
--
Gitblit v1.10.0