From a16210903a4d9185de05e471870ae2f99f60fcf7 Mon Sep 17 00:00:00 2001
From: Eduard Tudenhoefner <eduard.tudenhoefner@datastax.com>
Date: Wed, 20 Mar 2019 11:16:15 +0100
Subject: [PATCH] TINKERPOP-2180: Ensure gremlin.sh works when directories
 contain spaces

---
 CHANGELOG.asciidoc                      |  2 ++
 gremlin-console/src/main/bin/gremlin.sh | 18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index cbd55b9578f..88df8ad8762 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,8 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 [[release-3-3-7]]
 === TinkerPop 3.3.7 (Release Date: NOT OFFICIALLY RELEASED YET)
 
+* Ensure `gremlin.sh` works when directories contain spaces
+
 
 [[release-3-3-6]]
 === TinkerPop 3.3.6 (Release Date: March 18, 2019)
diff --git a/gremlin-console/src/main/bin/gremlin.sh b/gremlin-console/src/main/bin/gremlin.sh
index d8c94db5e3f..6253ee1e452 100755
--- a/gremlin-console/src/main/bin/gremlin.sh
+++ b/gremlin-console/src/main/bin/gremlin.sh
@@ -22,20 +22,20 @@
 set -e
 set -u
 
-USER_DIR=`pwd`
+USER_DIR=$(pwd)
 
-cd $(dirname $0)
-DIR=`pwd`
+cd "$(dirname "$0")"
+DIR=$(pwd)
 
-SCRIPT_NAME=`basename $0`
+SCRIPT_NAME="$(basename "$0")"
 while [ -h "${SCRIPT_NAME}" ]; do
   SOURCE="$(readlink "${SCRIPT_NAME}")"
   DIR="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
-  cd ${DIR}
+  cd "${DIR}"
 done
 
 cd ..
-SYSTEM_EXT_DIR="`pwd`/ext"
+SYSTEM_EXT_DIR="$(pwd)/ext"
 
 JAVA_OPTIONS=${JAVA_OPTIONS:-}
 
@@ -43,11 +43,11 @@ if [ ! -z "${JAVA_OPTIONS}" ]; then
   USER_EXT_DIR=$(grep -o '\-Dtinkerpop.ext=\(\([^"][^ ]*\)\|\("[^"]*"\)\)' <<< "${JAVA_OPTIONS}" | cut -f2 -d '=' | xargs -0 echo)
   if [ ! -z "${USER_EXT_DIR}" -a ! -d "${USER_EXT_DIR}" ]; then
     mkdir -p "${USER_EXT_DIR}"
-    cp -R ${SYSTEM_EXT_DIR}/* ${USER_EXT_DIR}/
+    cp -R "${SYSTEM_EXT_DIR}/*" "${USER_EXT_DIR}/"
   fi
 fi
 
-case `uname` in
+case $(uname) in
   CYGWIN*)
     CP="${CP:-}";$( echo lib/*.jar . | sed 's/ /;/g')
     ;;
@@ -103,4 +103,4 @@ if [ -n "$SCRIPT_DEBUG" ]; then
 fi
 
 # Start the JVM, execute the application, and return its exit code
-exec $JAVA $JAVA_OPTIONS org.apache.tinkerpop.gremlin.console.Console "$@"
+exec $JAVA "$JAVA_OPTIONS" org.apache.tinkerpop.gremlin.console.Console "$@"