Don't allow JLINE env var to mess up lein run. Fixes #131.

This commit is contained in:
Phil Hagelberg 2010-11-10 14:06:30 -08:00
parent a53e419f4c
commit ba3d4db49f

View file

@ -143,6 +143,7 @@ else
echo $CLOJURE_JAR echo $CLOJURE_JAR
fi fi
JLINE=""
if ([ "$1" = "repl" ] || [ "$1" = "interactive" ] || [ "$1" = "int" ]) && if ([ "$1" = "repl" ] || [ "$1" = "interactive" ] || [ "$1" = "int" ]) &&
[ -z $INSIDE_EMACS ] && [ "$TERM" != "dumb" ]; then [ -z $INSIDE_EMACS ] && [ "$TERM" != "dumb" ]; then
# Use rlwrap if it's available, otherwise fall back to JLine # Use rlwrap if it's available, otherwise fall back to JLine
@ -150,8 +151,8 @@ else
if [ $? -eq 1 ]; then if [ $? -eq 1 ]; then
JLINE=jline.ConsoleRunner JLINE=jline.ConsoleRunner
if [ "$OSTYPE" = "cygwin" ]; then if [ "$OSTYPE" = "cygwin" ]; then
JLINE="-Djline.terminal=jline.UnixTerminal jline.ConsoleRunner" JLINE="-Djline.terminal=jline.UnixTerminal jline.ConsoleRunner"
CYGWIN_JLINE=y CYGWIN_JLINE=y
fi fi
fi fi
fi fi