From dea089e6c06f587c906902590729b9adb4d0bb70 Mon Sep 17 00:00:00 2001 From: Malcolm Sparks Date: Fri, 12 Apr 2013 13:11:15 +0100 Subject: [PATCH] Fixes issue 1144. The fast trampoline functionality now works properly in the absence of a .lein/profiles.clj file. --- bin/lein | 2 +- bin/lein-pkg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/lein b/bin/lein index d0db75ab..4013688b 100755 --- a/bin/lein +++ b/bin/lein @@ -268,7 +268,7 @@ else if ([ "$LEIN_FAST_TRAMPOLINE" != "" ] || [ -r .lein-fast-trampoline ]) && [ -r project.clj ]; then - INPUTS="$@ $(cat project.clj) $LEIN_VERSION $(cat "$LEIN_HOME/profiles.clj")" + INPUTS="$@ $(cat project.clj) $LEIN_VERSION $(test -f "$LEIN_HOME/profiles.clj" && cat "$LEIN_HOME/profiles.clj")" INPUT_CHECKSUM=$(echo $INPUTS | shasum - | cut -f 1 -d " ") # Just don't change :target-path in project.clj, mkay? TRAMPOLINE_FILE="target/trampolines/$INPUT_CHECKSUM" diff --git a/bin/lein-pkg b/bin/lein-pkg index 2df90325..664ef3ab 100644 --- a/bin/lein-pkg +++ b/bin/lein-pkg @@ -76,7 +76,7 @@ export JVM_OPTS="${JVM_OPTS:-"$JAVA_OPTS"}" if ([ "$LEIN_FAST_TRAMPOLINE" != "" ] || [ -r .lein-fast-trampoline ]) && [ -r project.clj ]; then - INPUTS="$@ $(cat project.clj) $(cat "$LEIN_HOME/profiles.clj")" + INPUTS="$@ $(cat project.clj) $(test -f "$LEIN_HOME/profiles.clj" && cat "$LEIN_HOME/profiles.clj")" INPUT_CHECKSUM=$(echo $INPUTS | shasum - | cut -f 1 -d " ") # Just don't change :target-path in project.clj, mkay? TRAMPOLINE_FILE="target/trampolines/$INPUT_CHECKSUM"