From accfaa1c0915810fc63008e313df3a968f21a210 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Wed, 25 Oct 2006 18:55:52 +0000
Subject: [PATCH] Make several changes to administrative shell scripts provided with OpenDS. All of these changes fall under the blanket of issue 882, but are also associated with a number of individual sub-issues.
---
opendj-sdk/opends/resource/bin/ldif-diff.sh | 49 +++++--------------------------------------------
1 files changed, 5 insertions(+), 44 deletions(-)
diff --git a/opendj-sdk/opends/resource/bin/ldif-diff.sh b/opendj-sdk/opends/resource/bin/ldif-diff.sh
index 33155d8..77a144a 100755
--- a/opendj-sdk/opends/resource/bin/ldif-diff.sh
+++ b/opendj-sdk/opends/resource/bin/ldif-diff.sh
@@ -26,48 +26,9 @@
# Portions Copyright 2006 Sun Microsystems, Inc.
-# 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`
+# This script may be used to compare the contents of two LDIF files.
+OPENDS_INVOKE_CLASS="org.opends.server.tools.LDIFDiff"
+export OPENDS_INVOKE_CLASS
-cd `dirname $0`
-SCRIPT_DIR=`pwd`
-
-cd ..
-INSTANCE_ROOT=`pwd`
-export INSTANCE_ROOT
-
-cd ${WORKING_DIR}
-
-
-# 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
- 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.0 installation."
- exit 1
- fi
- else
- JAVA_BIN=${JAVA_HOME}/bin/java
- export JAVA_BIN
- fi
-fi
-
-CLASSPATH=${INSTANCE_ROOT}/classes
-for JAR in ${INSTANCE_ROOT}/lib/*.jar
-do
- CLASSPATH=${CLASSPATH}:${JAR}
-done
-export CLASSPATH
-
-
-${JAVA_BIN} ${JAVA_ARGS} org.opends.server.tools.LDIFDiff "$@"
-
+SCRIPT_DIR=`dirname "${0}"`
+"${SCRIPT_DIR}/_client-script.sh" "${@}"
--
Gitblit v1.10.0