yogsototh/leiningen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2024 into master

Browse source
This commit is contained in:
Jean Niklas L'orange 2015-11-10 23:09:08 +01:00
commit 98379a9c85
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bin/lein
View file

@ -222,20 +222,14 @@ else # Not running from a checkout
fi
fi
if [ -z "$JAVA_CMD" ]
then
JAVA_CMD=$(which java)
fi
if [ ! -x "$JAVA_CMD" ]
if [ ! -x "$JAVA_CMD" ] && ! type -f java >/dev/null
then
>&2 echo "Leiningen coundn't find 'java' executable, which is required."
>&2 echo "Please either set JAVA_CMD or put java (>=1.6) in your \$PATH ($PATH)."
exit 1
fi
export JAVA_CMD
export LEIN_JAVA_CMD="${LEIN_JAVA_CMD:-$JAVA_CMD}"
export LEIN_JAVA_CMD="${LEIN_JAVA_CMD:-${JAVA_CMD:-java}}"
if [[ -z "${DRIP_INIT+x}" && "$(basename "$LEIN_JAVA_CMD")" == *drip* ]]; then
export DRIP_INIT="$(printf -- '-e\n(require (quote leiningen.repl))')"