1 files changed, 12 insertions, 9 deletions
diff --git a/utils/platforms/rhino/bin/narwhal-rhino b/utils/platforms/rhino/bin/narwhal-rhino
index c1e8809..488362a 100755
--- a/utils/platforms/rhino/bin/narwhal-rhino
+++ b/utils/platforms/rhino/bin/narwhal-rhino
@@ -7,32 +7,35 @@ SELF_PATH=$(cd -P -- "$(dirname -- "$0")" && pwd -P) && SELF_PATH="$SELF_PATH/$(
 while [ -h "$SELF_PATH" ]; do
 	DIR=$(dirname -- "$SELF_PATH")
 	SYM=$(readlink -- "$SELF_PATH")
-	SELF_PATH=$(cd "$DIR" && cd $"(dirname -- "$SYM")" && pwd)/$(basename -- "$SYM")
+	SELF_PATH=$(cd -- "$DIR" && cd -- $(dirname -- "$SYM") && pwd)/$(basename -- "$SYM")
 done
 
-NARWHAL_PLATFORM_HOME=$(dirname "$(dirname -- "$SELF_PATH")")
+# NARWHAL_PLATFORM_HOME is the 2nd ancestor directory of this shell script
+export NARWHAL_PLATFORM_HOME=$(dirname -- "$(dirname -- "$SELF_PATH")")
+
 BOOTSTRAP=$NARWHAL_PLATFORM_HOME/bootstrap.js
 
-if [ ! "$NARWHAL_HOME" ]; then
+if [ -z "$NARWHAL_HOME" ]; then
 	NARWHAL_HOME=$(dirname -- "$(dirname -- "$NARWHAL_PLATFORM_HOME")")
 fi
 
-export NARWHAL_PLATFORM_HOME
-
-CLASSPATH=$NARWHAL_PLATFORM_HOME/jars/js.jar:$NARWHAL_PLATFORM_HOME/jars/jline.jar:$CLASSPATH
+CLASSPATH=$NARWHAL_PLATFORM_HOME/jars/js.jar:$NARWHAL_PLATFORM_HOME/jars/jline.jar
+if [ -z "$NARWHAL_CLASSPATH" ]; then
+    CLASSPATH=$NARWHAL_CLASSPATH:$CLASSPATH
+fi
 
 if [ "$(which cygpath 2>/dev/null)" ]; then
     CLASSPATH=$(cygpath -wp -- "$CLASSPATH")
     BOOTSTRAP=$(cygpath -wa -- "$BOOTSTRAP")
+    export NARWHAL_HOME=$(cygpath -wa -- "$NARWHAL_HOME")
+    export NARWHAL_PLATFORM_HOME=$(cygpath -wa -- "$NARWHAL_PLATFORM_HOME")
 fi
 
 JAVA_MAIN=org.mozilla.javascript.tools.shell.Main
 
 # drop into shell if there are no additional arguments
 if [ $# -lt 1 ]; then
-    # uses rlwrap (readline wrapper) if present
-    RLWRAP=$(which rlwrap 2>/dev/null)
-	$RLWRAP java -cp "$CLASSPATH" "$JAVA_MAIN" -f "$BOOTSTRAP" -f -
+    java -cp "$CLASSPATH" "$JAVA_MAIN" -f "$BOOTSTRAP" -f -
 else
 	java -cp "$CLASSPATH" "$JAVA_MAIN" "$BOOTSTRAP" "$0" "$@"
 fi