Running in $HOME is not running in bundled mode.

technomancy · Nov 11, 2011 · 53726ef · 53726ef
1 parent 68bc6ff
commit 53726ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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