From 34ef24e42b23d094a2dc9a2ff9904569318602f8 Mon Sep 17 00:00:00 2001
From: chebrard <chebrard@localhost>
Date: Mon, 26 Jan 2009 15:54:02 +0000
Subject: [PATCH] Frontport of all fixes related to SVR4 from branch 1.2 to trunk:
---
opends/resource/bin/_script-util.sh | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/opends/resource/bin/_script-util.sh b/opends/resource/bin/_script-util.sh
index cd52326..8263497 100644
--- a/opends/resource/bin/_script-util.sh
+++ b/opends/resource/bin/_script-util.sh
@@ -194,8 +194,12 @@
then
if [ "${SCRIPT_NAME}" = "configure" ]
then
- echo "${INSTALL_ROOT}/configure has already be run. Exiting."
- exit 0
+ isVersionOrHelp $*
+ if [ $? -eq 1 ]
+ then
+ echo "${INSTALL_ROOT}/configure has already been run. Exiting."
+ exit 0
+ fi
fi
INSTANCE_ROOT=`cat /etc/opends/instance.loc`
else
@@ -267,7 +271,7 @@
IFS=${CURRENT_IFS}
}
-if [ "${SCRIPT_NAME}" != "configure" ]
+if [ "${SCRIPT_NAME}" != "configure" ] && [ "${SCRIPT_NAME}" != "unconfigure" ]
then
# Perform check unless it is specified not to do it
if [ -z "$NO_CHECK" ]
--
Gitblit v1.10.0