Tidy up from-checkout classpath setup.
This commit is contained in:
parent
bb33e60639
commit
b4661d8cb9
2 changed files with 6 additions and 5 deletions
10
bin/lein
10
bin/lein
|
@ -104,11 +104,13 @@ BIN_DIR="$(dirname "$SCRIPT")"
|
|||
if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
|
||||
# Running from source checkout
|
||||
LEIN_DIR="$(dirname "$BIN_DIR")"
|
||||
LEIN_LIBS="$(find -H "$LEIN_DIR/lib" -mindepth 1 -maxdepth 1 -print0 2> /dev/null | tr \\0 \:)"
|
||||
CLASSPATH="$CLASSPATH:leiningen-core/src/:$LEIN_LIBS:$LEIN_DIR/src:$LEIN_DIR/resources:$LEIN_JAR"
|
||||
CLASSPATH="$CLASSPATH:$LEIN_DIR/leiningen-core/src/"
|
||||
CLASSPATH="$CLASSPATH::$LEIN_DIR/lib/*:$LEIN_DIR/leiningen-core/lib/*"
|
||||
CLASSPATH="$CLASSPATH:$LEIN_DIR/src:$LEIN_DIR/resources:$LEIN_JAR"
|
||||
|
||||
if [ "$LEIN_LIBS" = "" -a "$1" != "self-install" -a ! -r "$LEIN_JAR" ]; then
|
||||
echo "Leiningen is missing its dependencies. Please see \"Building\" in the README."
|
||||
if [ "$(ls $LEIN_DIR/leiningen-core/lib/*)" = "" ]; then
|
||||
echo "Leiningen is missing its dependencies."
|
||||
echo "Please see \"Building\" in the README."
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
:dependencies [[leiningen-core "2.0.0-SNAPSHOT"]
|
||||
[clucy "0.2.2"]
|
||||
[lancet "1.0.1"]
|
||||
[robert/hooke "1.1.2"]
|
||||
[stencil "0.2.0"]]
|
||||
:test-selectors {:default (complement :busted)}
|
||||
:eval-in-leiningen true)
|
||||
|
|
Loading…
Reference in a new issue