Skip to content

TINKERPOP-2180: Ensure gremlin.sh works when directories contain spaces #1085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spmallette merged 1 commit into from
Apr 2, 2019
Merged

TINKERPOP-2180: Ensure gremlin.sh works when directories contain spaces #1085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
18 changes: 9 additions & 9 deletions gremlin-console/src/main/bin/gremlin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,32 @@
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:-}

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')
;;
Expand Down Expand Up @@ -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 "$@"