Merge pull request #1616 from hugoduncan/feature/add-no-user-profiles
Add LEIN_NO_USER_PROFILES to avoid user profiles
This commit is contained in:
commit
5e25111bf9
2 changed files with 5 additions and 4 deletions
2
bin/lein
2
bin/lein
|
@ -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"
|
||||||
|
|
|
@ -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})))]
|
||||||
|
(if (not (System/getenv "LEIN_NO_USER_PROFILES"))
|
||||||
(merge-with error-fn
|
(merge-with error-fn
|
||||||
(load-profiles (leiningen-home))
|
(load-profiles (leiningen-home))
|
||||||
(into {} (profiles-d-profiles)))))))
|
(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'"
|
||||||
|
|
Loading…
Reference in a new issue