yogsototh/leiningen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1616 from hugoduncan/feature/add-no-user-profiles

Browse source 
Add LEIN_NO_USER_PROFILES to avoid user profiles
This commit is contained in:
Phil Hagelberg 2014-08-01 09:17:55 -07:00
commit 5e25111bf9
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/lein
View file

@ -179,7 +179,7 @@ if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
ORIG_PWD="$PWD" ORIG_PWD="$PWD"
cd "$LEIN_DIR" cd "$LEIN_DIR"
$0 classpath .lein-classpath LEIN_NO_USER_PROFILES=1 $0 classpath .lein-classpath
sum "$LEIN_DIR/project.clj" "$LEIN_DIR/leiningen-core/project.clj" > \ sum "$LEIN_DIR/project.clj" "$LEIN_DIR/leiningen-core/project.clj" > \
.lein-project-checksum .lein-project-checksum
cd "$ORIG_PWD" cd "$ORIG_PWD"

7
leiningen-core/src/leiningen/core/user.clj
View file

@ -80,9 +80,10 @@
(-> a meta :origin) "and in" (-> b meta :origin))) (-> a meta :origin) "and in" (-> b meta :origin)))
(throw (ex-info "Multiple profiles defined in ~/.lein" (throw (ex-info "Multiple profiles defined in ~/.lein"
{:exit-code 1})))] {:exit-code 1})))]
(merge-with error-fn (if (not (System/getenv "LEIN_NO_USER_PROFILES"))
(load-profiles (leiningen-home)) (merge-with error-fn
(into {} (profiles-d-profiles))))))) (load-profiles (leiningen-home))
(into {} (profiles-d-profiles))))))))
(defn gpg-program (defn gpg-program
"Lookup the gpg program to use, defaulting to 'gpg'" "Lookup the gpg program to use, defaulting to 'gpg'"