From 8c46207b056ab0986d5ae810e995d3116f3a72cc Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 04 Mar 2014 14:30:51 +0000
Subject: [PATCH] OPENDJ-1098 Upgrading must disable old patches - II.

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

diff --git a/opendj3-server-dev/resource/upgrade b/opendj3-server-dev/resource/upgrade
index b8f9040..3b582e7 100644
--- a/opendj3-server-dev/resource/upgrade
+++ b/opendj3-server-dev/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