From b406bda40b630eab228ecafe169e9e3ca695a825 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 07 Apr 2008 22:51:18 +0000
Subject: [PATCH] Second part of fix for issue 3126 (Cannot run setup if unziped in directory with spaces in name).

---
 opendj-sdk/opends/resource/bin/_server-script.sh                  |    2 +-
 opendj-sdk/opends/resource/bin/stop-ds                            |    2 +-
 opendj-sdk/opends/resource/setup                                  |    2 +-
 opendj-sdk/opends/resource/bin/_client-script.sh                  |    2 +-
 opendj-sdk/opends/resource/bin/_script-util.sh                    |    4 ++--
 opendj-sdk/opends/resource/upgrade                                |    2 +-
 opendj-sdk/opends/resource/bin/start-ds                           |    2 +-
 opendj-sdk/opends/resource/webstart/create-webstart-standalone.sh |    2 +-
 opendj-sdk/opends/resource/uninstall                              |    2 +-
 opendj-sdk/opends/resource/bin/_mixed-script.sh                   |    2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/opendj-sdk/opends/resource/bin/_client-script.sh b/opendj-sdk/opends/resource/bin/_client-script.sh
index 9145c1d..b4c27fe 100755
--- a/opendj-sdk/opends/resource/bin/_client-script.sh
+++ b/opendj-sdk/opends/resource/bin/_client-script.sh
@@ -40,7 +40,7 @@
 # root so that we can use them to create appropriate paths.
 WORKING_DIR=`pwd`
 
-cd `dirname "${0}"`
+cd "`dirname "${0}"`"
 SCRIPT_DIR=`pwd`
 
 cd ..
diff --git a/opendj-sdk/opends/resource/bin/_mixed-script.sh b/opendj-sdk/opends/resource/bin/_mixed-script.sh
index 28f170a..91e866c 100644
--- a/opendj-sdk/opends/resource/bin/_mixed-script.sh
+++ b/opendj-sdk/opends/resource/bin/_mixed-script.sh
@@ -41,7 +41,7 @@
 # root so that we can use them to create appropriate paths.
 WORKING_DIR=`pwd`
 
-cd `dirname "${0}"`
+cd "`dirname "${0}"`"
 SCRIPT_DIR=`pwd`
 
 cd ..
diff --git a/opendj-sdk/opends/resource/bin/_script-util.sh b/opendj-sdk/opends/resource/bin/_script-util.sh
index 1094310..7a70f6b 100644
--- a/opendj-sdk/opends/resource/bin/_script-util.sh
+++ b/opendj-sdk/opends/resource/bin/_script-util.sh
@@ -145,7 +145,7 @@
 
 # Configure the appropriate CLASSPATH.
 set_classpath() {
-  CLASSPATH="${INSTANCE_ROOT}"/classes
+  CLASSPATH=${INSTANCE_ROOT}/classes
   for JAR in "${INSTANCE_ROOT}"/lib/*.jar
   do
     CLASSPATH=${CLASSPATH}:${JAR}
@@ -160,7 +160,7 @@
   # root so that we can use them to create appropriate paths.
   WORKING_DIR=`pwd`
 
-  cd `dirname "${0}"`
+  cd "`dirname "${0}"`"
   cd ..
   INSTANCE_ROOT=`pwd`
   cd "${WORKING_DIR}"
diff --git a/opendj-sdk/opends/resource/bin/_server-script.sh b/opendj-sdk/opends/resource/bin/_server-script.sh
index 5fe8854..aa88673 100755
--- a/opendj-sdk/opends/resource/bin/_server-script.sh
+++ b/opendj-sdk/opends/resource/bin/_server-script.sh
@@ -40,7 +40,7 @@
 # root so that we can use them to create appropriate paths.
 WORKING_DIR=`pwd`
 
-cd `dirname "${0}"`
+cd "`dirname "${0}"`"
 SCRIPT_DIR=`pwd`
 
 cd ..
diff --git a/opendj-sdk/opends/resource/bin/start-ds b/opendj-sdk/opends/resource/bin/start-ds
index 5277535..a8c0a99 100755
--- a/opendj-sdk/opends/resource/bin/start-ds
+++ b/opendj-sdk/opends/resource/bin/start-ds
@@ -31,7 +31,7 @@
 # root so that we can use them to create appropriate paths.
 WORKING_DIR=`pwd`
 
-cd `dirname "${0}"`
+cd "`dirname "${0}"`"
 SCRIPT_DIR=`pwd`
 
 cd ..
diff --git a/opendj-sdk/opends/resource/bin/stop-ds b/opendj-sdk/opends/resource/bin/stop-ds
index 5445d13..f432632 100755
--- a/opendj-sdk/opends/resource/bin/stop-ds
+++ b/opendj-sdk/opends/resource/bin/stop-ds
@@ -40,7 +40,7 @@
 # root so that we can use them to create appropriate paths.
 WORKING_DIR=`pwd`
 
-cd `dirname "${0}"`
+cd "`dirname "${0}"`"
 SCRIPT_DIR=`pwd`
 
 cd ..
diff --git a/opendj-sdk/opends/resource/setup b/opendj-sdk/opends/resource/setup
index 90033cf..bb7eb12 100755
--- a/opendj-sdk/opends/resource/setup
+++ b/opendj-sdk/opends/resource/setup
@@ -31,7 +31,7 @@
 # root so that we can use them to create appropriate paths.
 WORKING_DIR=`pwd`
 
-cd `dirname "${0}"`
+cd "`dirname "${0}"`"
 SCRIPT_DIR=`pwd`
 
 INSTANCE_ROOT=${SCRIPT_DIR}
diff --git a/opendj-sdk/opends/resource/uninstall b/opendj-sdk/opends/resource/uninstall
index 0bbfc23..e50905d 100644
--- a/opendj-sdk/opends/resource/uninstall
+++ b/opendj-sdk/opends/resource/uninstall
@@ -33,7 +33,7 @@
 # root so that we can use them to create appropriate paths.
 WORKING_DIR=`pwd`
 
-cd `dirname "${0}"`
+cd "`dirname "${0}"`"
 SCRIPT_DIR=`pwd`
 
 SCRIPT_NAME=uninstall
diff --git a/opendj-sdk/opends/resource/upgrade b/opendj-sdk/opends/resource/upgrade
index 020f523..59ea211 100644
--- a/opendj-sdk/opends/resource/upgrade
+++ b/opendj-sdk/opends/resource/upgrade
@@ -30,7 +30,7 @@
 # root so that we can use them to create appropriate paths.
 WORKING_DIR=`pwd`
 
-cd `dirname "${0}"`
+cd "`dirname "${0}"`"
 SCRIPT_DIR=`pwd`
 
 INSTANCE_ROOT=${SCRIPT_DIR}
diff --git a/opendj-sdk/opends/resource/webstart/create-webstart-standalone.sh b/opendj-sdk/opends/resource/webstart/create-webstart-standalone.sh
index da06678..3951c40 100755
--- a/opendj-sdk/opends/resource/webstart/create-webstart-standalone.sh
+++ b/opendj-sdk/opends/resource/webstart/create-webstart-standalone.sh
@@ -3,7 +3,7 @@
 
 # Determine the location to this script so that we know where we are in the
 # OpenDS source tree.
-cd `dirname $0`
+cd "`dirname $0`"
 SCRIPT_DIR=`pwd`
 cd ../..
 ROOT_DIR=`pwd`

--
Gitblit v1.10.0