From 7e014d165df1bf3dd13ffc4a5d8906a0b1561eba Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 17 Aug 2007 00:53:26 +0000
Subject: [PATCH] The following modifications have the following goals:
---
opendj-sdk/opends/resource/uninstall | 106 +++-------------------------------------------------
1 files changed, 7 insertions(+), 99 deletions(-)
diff --git a/opendj-sdk/opends/resource/uninstall b/opendj-sdk/opends/resource/uninstall
index 019df2e..c8f0744 100644
--- a/opendj-sdk/opends/resource/uninstall
+++ b/opendj-sdk/opends/resource/uninstall
@@ -26,104 +26,12 @@
# Portions Copyright 2006-2007 Sun Microsystems, Inc.
-# See if JAVA_HOME is set. If not, then see if there is a java executable in
-# the path and try to figure it out.
-if test -z "${JAVA_BIN}"
-then
- if test -z "${JAVA_HOME}"
- then
- if test -f "${INSTANCE_ROOT}/lib/set-java-home"
- then
- . "${INSTANCE_ROOT}/lib/set-java-home"
- JAVA_BIN="${JAVA_HOME}/bin/java"
- export JAVA_BIN
- else
- JAVA_BIN=`which java 2> /dev/null`
- if test ${?} -eq 0
- then
- export JAVA_BIN
- else
- echo "Please set JAVA_HOME to the root of a Java 5 (or later) installation."
- exit 1
- fi
- fi
- else
- JAVA_BIN="${JAVA_HOME}/bin/java"
- export JAVA_BIN
- fi
-fi
+# This script may be used to display the status panel.
+OPENDS_INVOKE_CLASS="org.opends.guitools.uninstaller.UninstallLauncher"
+export OPENDS_INVOKE_CLASS
+SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=uninstall"
+export SCRIPT_NAME_ARG
-# Explicitly set the PATH, LD_LIBRARY_PATH, LD_PRELOAD, and other important
-# system environment variables for security and compatibility reasons.
-PATH=/bin:/usr/bin
-LD_LIBRARY_PATH=
-LD_LIBRARY_PATH_32=
-LD_LIBRARY_PATH_64=
-LD_PRELOAD=
-LD_PRELOAD_32=
-LD_PRELOAD_64=
-export PATH LD_LIBRARY_PATH LD_LIBRARY_PATH_32 LD_LIBRARY_PATH_64 \
- LD_PRELOAD LD_PRELOAD_32 LD_PRELOAD_34
-
-
-# Capture the current working directory so that we can change to it later.
-# Then capture the location of this script and the Directory Server instance
-# root so that we can use them to create appropriate paths.
-WORKING_DIR=`pwd`
-
-cd `dirname "${0}"`
-SCRIPT_DIR=`pwd`
-
-INSTANCE_ROOT=${SCRIPT_DIR}
-export INSTANCE_ROOT
-
-cd "${WORKING_DIR}"
-
-
-# Configure the appropriate CLASSPATH to test.
-CLASSPATH=${INSTANCE_ROOT}/classes
-for JAR in ${INSTANCE_ROOT}/lib/*.jar
-do
- CLASSPATH=${CLASSPATH}:${JAR}
-done
-export CLASSPATH
-
-# Determine whether the detected Java environment is acceptable for use.
-if test -z "${JAVA_ARGS}"
-then
- "${JAVA_BIN}" -client org.opends.server.tools.InstallDS -t 2> /dev/null
- if test ${?} -eq 0
- then
- JAVA_ARGS="-client"
- else
- "${JAVA_BIN}" org.opends.server.tools.InstallDS -t 2> /dev/null
- if test ${?} -ne 0
- then
- echo "ERROR: The detected Java version could not be used. Please set "
- echo " JAVA_HOME to the root of a Java 5 (or later) installation."
- exit 1
- fi
- fi
-else
- "${JAVA_BIN}" ${JAVA_ARGS} org.opends.server.tools.InstallDS -t 2> /dev/null
- if test ${?} -ne 0
- then
- echo "ERROR: The detected Java version could not be used. Please set "
- echo " JAVA_HOME to the root of a Java 5 (or later) installation."
- exit 1
- fi
-fi
-
-
-# Launch the uninstall process.
-"${JAVA_BIN}" org.opends.guitools.uninstaller.UninstallLauncher "${@}"
-
-RETURN_CODE=$?
-if test ${RETURN_CODE} -eq 50
-then
- # Version info was on requested
- exit 0
-else
- exit ${RETURN_CODE}
-fi
+SCRIPT_DIR=`dirname "${0}"`
+"${SCRIPT_DIR}/lib/_client-script.sh" "${@}"
\ No newline at end of file
--
Gitblit v1.10.0