From 5f8b6b9c154ee7af10e5b3db6228fc3bfe905949 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 06 Jul 2007 23:36:07 +0000
Subject: [PATCH] Revert the changes made in revision 2281 for issue #1865 because they have broken the graphical setup utility.  With the changes committed in revision 2281, the setup dialog exits immediately with no error, most likely because of the introduction of a new System.exit calls.

---
 opends/resource/upgrade |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/opends/resource/upgrade b/opends/resource/upgrade
index 90e2792..b2e2857 100644
--- a/opends/resource/upgrade
+++ b/opends/resource/upgrade
@@ -136,8 +136,7 @@
 done
 export CLASSPATH
 "${JAVA_BIN}" org.opends.quicksetup.upgrader.BuildExtractor "${@}"
-RETURN_CODE=$?
-if test ${RETURN_CODE} -eq 0
+if test $? -eq 0
 then
   # Configure the appropriate CLASSPATH.
   # Unlike BuildExtractor, the Upgrader uses
@@ -149,10 +148,6 @@
   done
   # Launch the upgrade process.
   "${JAVA_BIN}" org.opends.quicksetup.upgrader.UpgradeLauncher "${@}"
-elif test ${RETURN_CODE} -eq 50
-then
-  # Version info was on requested
-  exit 0
 else
   exit 101
 fi

--
Gitblit v1.10.0