From 426f6fff96db9c07683e5a27b8b745b3e13c29ff Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Fri, 08 Jun 2007 19:15:27 +0000
Subject: [PATCH] This commit address several related issues regarding the upgrader CLI:
---
opends/resource/upgrade | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/opends/resource/upgrade b/opends/resource/upgrade
index 09a5a4d..b2e2857 100644
--- a/opends/resource/upgrade
+++ b/opends/resource/upgrade
@@ -136,8 +136,7 @@
done
export CLASSPATH
"${JAVA_BIN}" org.opends.quicksetup.upgrader.BuildExtractor "${@}"
-
-if [ -r "${INSTANCE_ROOT}/tmp/upgrade" ]
+if test $? -eq 0
then
# Configure the appropriate CLASSPATH.
# Unlike BuildExtractor, the Upgrader uses
@@ -149,14 +148,6 @@
done
# Launch the upgrade process.
"${JAVA_BIN}" org.opends.quicksetup.upgrader.UpgradeLauncher "${@}"
-
- # Clean up if necessary
- if [ -r "${INSTANCE_ROOT}/tmp/upgrade" ]
- then
- rm -fr "${INSTANCE_ROOT}/tmp/upgrade"
- fi
else
- # Build extractor didn't work. Invoke the upgrader
- # to report errors and usage.
- "${JAVA_BIN}" org.opends.quicksetup.upgrader.UpgradeLauncher "${@}"
+ exit 101
fi
--
Gitblit v1.10.0