From 53726ef2fec6ce97f2825edd00c3bcdae017c951 Mon Sep 17 00:00:00 2001 From: Phil Hagelberg Date: Fri, 11 Nov 2011 08:49:50 -0800 Subject: [PATCH] Running in $HOME is not running in bundled mode. --- bin/lein | 4 +--- bin/lein-pkg | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bin/lein b/bin/lein index 32d0bf6bd..b9c852eac 100755 --- a/bin/lein +++ b/bin/lein @@ -33,16 +33,14 @@ do done if [ "$LEIN_HOME" = "" ]; then - if [ -d "$ORIGINAL_PWD/.lein" ]; then + if [ -d "$ORIGINAL_PWD/.lein" ] && [ "$ORIGINAL_PWD" != "$HOME" ]; then echo "Leiningen is running in bundled mode." LEIN_HOME="$ORIGINAL_PWD/.lein" else LEIN_HOME="$HOME/.lein" fi - fi - DEV_PLUGINS="$(ls -1 lib/dev/*jar 2> /dev/null)" USER_PLUGINS="$(ls -1 "$LEIN_HOME"/plugins/*jar 2> /dev/null)" diff --git a/bin/lein-pkg b/bin/lein-pkg index 85deaeeb6..ebeead21c 100644 --- a/bin/lein-pkg +++ b/bin/lein-pkg @@ -30,7 +30,7 @@ JVM_OPTS=${JVM_OPTS:-"$JAVA_OPTS"} JAVA_CMD=${JAVA_CMD:-"java"} if [ "$LEIN_HOME" = "" ]; then - if [ -d "$ORIGINAL_PWD/.lein" ]; then + if [ -d "$ORIGINAL_PWD/.lein" ] && [ "$ORIGINAL_PWD" != "$HOME" ]; then echo "Leiningen is running in bundled mode." LEIN_HOME="$ORIGINAL_PWD/.lein" else