Merge branch 'lein-1.7'

bin/compile

@@ -9,7 +9,7 @@ BUILD_DIR=$1
 CACHE_DIR=$2
 
 # install leiningen jar
-LEIN_VERSION="1.6.2"
+LEIN_VERSION="1.7.0"
 LEIN_JAR_URL="https://heroku-buildpack-clojure.s3.amazonaws.com/leiningen-$LEIN_VERSION-standalone.jar"
 LEIN_JAR_PATH="$CACHE_DIR/leiningen-$LEIN_VERSION-standalone.jar"
 
@@ -67,7 +67,7 @@ fi
 
 cd $BUILD_DIR
 PATH=.lein/bin:/usr/local/bin:/usr/bin:/bin \
-  JAVA_OPTS="-Xmx500m -Duser.home=$BUILD_DIR" \
+  LEIN_JVM_OPTS="-Xmx500m -Duser.home=$BUILD_DIR" \
   lein $LEIN_BUILD_TASK 2>&1 | sed -u 's/^/       /'
 if [ "${PIPESTATUS[*]}" != "0 0" ]; then
   echo " !     Failed to install dependencies with Leiningen"

opt/lein

@@ -22,21 +22,20 @@ if [ "$1" == "repl" ]; then
   else
     exec java $LEIN_JVM_OPTS -cp $CLASSPATH clojure.main --repl
   fi
-elif [ "$1" == "trampoline" ]; then
+else
   TRAMPOLINE_FILE="/tmp/lein-trampoline-$$"
-  CLASSPATH="$CLASSPATH:src/:$LEIN_JAR"
-  java $LEIN_JVM_OPTS -Dleiningen.trampoline-file=$TRAMPOLINE_FILE -cp "$CLASSPATH" \
+  CLASSPATH="$CLASSPATH:test/:src/:.lein-plugins/*:lib/dev/*:$LEIN_JAR"
+
+  java $LEIN_JVM_OPTS -cp "$CLASSPATH" \
+    -Dleiningen.trampoline-file=$TRAMPOLINE_FILE \
     clojure.main -e "(use 'leiningen.core)(-main)" /dev/null $@
+  EXIT_CODE=$?
+
   if [ -r $TRAMPOLINE_FILE ]; then
     TRAMPOLINE="$(cat $TRAMPOLINE_FILE)"
     rm $TRAMPOLINE_FILE
-    exec sh -c "$TRAMPOLINE"
+    exec sh -c "exec $TRAMPOLINE"
+  else
+    exit $EXIT_CODE
   fi
-elif [ "$1" == "self-repl" ]; then
-  CLASSPATH="$CLASSPATH:src/:$LEIN_JAR"
-  exec rlwrap java $LEIN_JVM_OPTS -cp "$CLASSPATH" clojure.main
-else
-  CLASSPATH="$CLASSPATH:test/:src/:lib/dev/*:$LEIN_JAR"
-  exec java $LEIN_JVM_OPTS -cp "$CLASSPATH" \
-    clojure.main -e "(use 'leiningen.core)(-main)" /dev/null $@
 fi