From 9f55c3f076ecaf3aaad201c96446cff0169c243e Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Wed, 05 Mar 2014 16:29:48 +0000
Subject: [PATCH] Backport fix for OPENDJ-1098 Upgrading must disable old patches II

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

diff --git a/opends/resource/upgrade b/opends/resource/upgrade
index b8f9040..3b582e7 100644
--- a/opends/resource/upgrade
+++ b/opends/resource/upgrade
@@ -32,13 +32,13 @@
 SCRIPT_NAME="upgrade"
 export SCRIPT_NAME
 
-DIR_CLASSES="./classes"
+SCRIPT_DIR=`dirname "${0}"`
+DIR_CLASSES="${SCRIPT_DIR}/classes"
 # The upgrade is not compatible with patches. If the folder is not empty
 # we renamed it as "classes.disabled", and the upgrade process should be launched properly.
 if [ "`(ls -A ${DIR_CLASSES})`" ]; then
-    mv -f ${DIR_CLASSES} "./classes.disabled"
+    mv -f ${DIR_CLASSES} "${SCRIPT_DIR}/classes.disabled"
     mkdir ${DIR_CLASSES}
 fi
 
-SCRIPT_DIR=`dirname "${0}"`
 "${SCRIPT_DIR}/lib/_server-script.sh" "${@}"

--
Gitblit v1.10.0