raco pkg: fix `raco setup' sensitivity to package scope
Merge to v5.3.4
This commit is contained in:
parent
ff324f9270
commit
d195e3889b
|
@ -6,9 +6,10 @@
|
||||||
"commands.rkt"
|
"commands.rkt"
|
||||||
(prefix-in setup: setup/setup))
|
(prefix-in setup: setup/setup))
|
||||||
|
|
||||||
(define (setup no-setup? installation? setup-collects)
|
(define (setup no-setup? setup-collects)
|
||||||
(unless (or no-setup?
|
(unless (or no-setup?
|
||||||
(not (member (getenv "PLT_PKG_NOSETUP") '(#f ""))))
|
(not (member (getenv "PLT_PKG_NOSETUP") '(#f ""))))
|
||||||
|
(define installation? (current-install-system-wide?))
|
||||||
(setup:setup
|
(setup:setup
|
||||||
#:make-user? (not installation?)
|
#:make-user? (not installation?)
|
||||||
#:collections (and setup-collects
|
#:collections (and setup-collects
|
||||||
|
@ -87,7 +88,7 @@
|
||||||
#:ignore-checksums? ignore-checksums
|
#:ignore-checksums? ignore-checksums
|
||||||
(for/list ([p (in-list pkg-source)])
|
(for/list ([p (in-list pkg-source)])
|
||||||
(pkg-desc p (or (and link 'link) type) name #f))))
|
(pkg-desc p (or (and link 'link) type) name #f))))
|
||||||
(setup no-setup installation setup-collects))))]
|
(setup no-setup setup-collects))))]
|
||||||
[update
|
[update
|
||||||
"Update packages"
|
"Update packages"
|
||||||
#:once-each
|
#:once-each
|
||||||
|
@ -126,7 +127,7 @@
|
||||||
#:dep-behavior deps
|
#:dep-behavior deps
|
||||||
#:deps? update-deps))
|
#:deps? update-deps))
|
||||||
(when setup-collects
|
(when setup-collects
|
||||||
(setup no-setup installation setup-collects)))))]
|
(setup no-setup setup-collects)))))]
|
||||||
[remove
|
[remove
|
||||||
"Remove packages"
|
"Remove packages"
|
||||||
#:once-each
|
#:once-each
|
||||||
|
@ -152,7 +153,7 @@
|
||||||
(remove-packages pkgs
|
(remove-packages pkgs
|
||||||
#:auto? auto
|
#:auto? auto
|
||||||
#:force? force)
|
#:force? force)
|
||||||
(setup no-setup installation #f))))]
|
(setup no-setup #f))))]
|
||||||
[show
|
[show
|
||||||
"Show information about installed packages"
|
"Show information about installed packages"
|
||||||
#:once-each
|
#:once-each
|
||||||
|
|
Loading…
Reference in New Issue
Block a user