From bd749655526301f244c18ce3ef4882fa2bd112e4 Mon Sep 17 00:00:00 2001 From: Jeff Williams Date: Mon, 15 Apr 2013 15:28:48 -0700 Subject: [PATCH] don't split quoted arguments on spaces (#397) --- jsdoc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/jsdoc b/jsdoc index 106aa62e..5e6db50f 100755 --- a/jsdoc +++ b/jsdoc @@ -18,15 +18,12 @@ URLPATH="file://$UBASEPATH" URLPATH=`echo "$URLPATH" | sed -e 's/ /%20/g'` ENCODEDBASEPATH=`echo "$BASEPATH" | sed -e 's/ /%20/g'` -ARGS="$@" - if test "$1" = "--debug" then echo "Running Debug" CMD="org.mozilla.javascript.tools.debugger.Main -debug" # strip --debug argument - length=$(($#-1)) - ARGS=${@:2:$length} + shift else CMD="org.mozilla.javascript.tools.shell.Main" fi @@ -36,9 +33,9 @@ if test "$1" = "-T" then echo "Running Tests" cd -P "$(dirname "$SOURCE")" - java -classpath "${BASEPATH}/rhino/js.jar" ${CMD} -opt -1 -modules "${URLPATH}/node_modules" -modules "${URLPATH}/rhino" -modules "${URLPATH}/lib" -modules "${URLPATH}" "${BASEPATH}/jsdoc.js" $ARGS --dirname="${BASEPATH}/" + java -classpath "${BASEPATH}/rhino/js.jar" ${CMD} -opt -1 -modules "${URLPATH}/node_modules" -modules "${URLPATH}/rhino" -modules "${URLPATH}/lib" -modules "${URLPATH}" "${BASEPATH}/jsdoc.js" "$@" --dirname="${BASEPATH}/" else # normal mode should be quiet - java -classpath "${BASEPATH}/rhino/js.jar" ${CMD} -modules "${URLPATH}/node_modules" -modules "${URLPATH}/rhino" -modules "${URLPATH}/lib" -modules "${URLPATH}" "${BASEPATH}/jsdoc.js" $ARGS --dirname="${BASEPATH}/" + java -classpath "${BASEPATH}/rhino/js.jar" ${CMD} -modules "${URLPATH}/node_modules" -modules "${URLPATH}/rhino" -modules "${URLPATH}/lib" -modules "${URLPATH}" "${BASEPATH}/jsdoc.js" "$@" --dirname="${BASEPATH}/" fi