Merge pull request #1691 from technomancy/fix-erroneous-shell-command-form

Fix negation in shell-command form.

bin/lein

@@ -296,8 +296,11 @@ else
         echo "Leiningen's classpath: $CLASSPATH"
     fi
 
-    if ([ "$LEIN_FAST_TRAMPOLINE" != "" ] || [ -r .lein-fast-trampoline ]) &&
-        [ -r project.clj ]; then
+    if [ -r .lein-fast-trampoline ]; then
+        export LEIN_FAST_TRAMPOLINE='y'
+    fi
+
+    if [ "$LEIN_FAST_TRAMPOLINE" != "" ] && [ -r project.clj ]; then
         INPUTS="$@ $(cat project.clj) $LEIN_VERSION $(test -f "$LEIN_HOME/profiles.clj" && cat "$LEIN_HOME/profiles.clj")"
         export INPUT_CHECKSUM=$(echo $INPUTS | shasum - | cut -f 1 -d " ")
         # Just don't change :target-path in project.clj, mkay?

leiningen-core/src/leiningen/core/eval.clj

@@ -210,7 +210,7 @@
                     (io/file (:target-path project) (str checksum "-init.clj"))
                     (File/createTempFile "form-init" ".clj"))]
     (spit init-file
-          (pr-str (if (System/getenv "LEIN_FAST_TRAMPOLINE")
+          (pr-str (if-not (System/getenv "LEIN_FAST_TRAMPOLINE")
                     `(.deleteOnExit (File. ~(.getCanonicalPath init-file))))
                   form))
     `(~(or (:java-cmd project) (System/getenv "JAVA_CMD") "java")