Only return non-nil if doom-packages-purge worked
This commit is contained in:
parent
88096a81a9
commit
8834ba17e3
1 changed files with 27 additions and 21 deletions
|
@ -313,24 +313,30 @@ a list of packages that will be removed."
|
||||||
(print! (start "Searching for orphaned packages..."))
|
(print! (start "Searching for orphaned packages..."))
|
||||||
(cl-destructuring-bind (builds repos)
|
(cl-destructuring-bind (builds repos)
|
||||||
(doom--packages-to-purge)
|
(doom--packages-to-purge)
|
||||||
|
(let (success)
|
||||||
(print-group!
|
(print-group!
|
||||||
(if builds-p
|
(if builds-p
|
||||||
(and (doom--packages-purge builds "build" auto-accept-p
|
(and (doom--packages-purge builds "build" auto-accept-p
|
||||||
(straight--build-dir it)
|
(straight--build-dir it)
|
||||||
(straight--modified-file it))
|
(straight--modified-file it))
|
||||||
|
(setq success t)
|
||||||
(straight-prune-build-cache))
|
(straight-prune-build-cache))
|
||||||
(print! (info "Skipping builds")))
|
(print! (info "Skipping builds")))
|
||||||
(if repos-p
|
(if repos-p
|
||||||
(doom--packages-purge repos "repo" auto-accept-p
|
(and (doom--packages-purge repos "repo" auto-accept-p
|
||||||
(straight--repos-dir it))
|
(straight--repos-dir it))
|
||||||
|
(setq success t))
|
||||||
(print! (info "Skipping repos")))
|
(print! (info "Skipping repos")))
|
||||||
(if (not elpa-p)
|
(if (not elpa-p)
|
||||||
(print! (info "Skipping elpa packages"))
|
(print! (info "Skipping elpa packages"))
|
||||||
(unless (bound-and-true-p package--initialized)
|
(unless (bound-and-true-p package--initialized)
|
||||||
(package-initialize))
|
(package-initialize))
|
||||||
(doom--packages-purge (mapcar #'symbol-name (mapcar #'car package-alist))
|
(and (doom--packages-purge (mapcar #'symbol-name (mapcar #'car package-alist))
|
||||||
"package" auto-accept-p
|
"package" auto-accept-p
|
||||||
(package-desc-dir (cadr (assq (intern it) package-alist))))
|
(package-desc-dir (cadr (assq (intern it) package-alist))))
|
||||||
|
(setq success t))
|
||||||
(when (file-directory-p package-user-dir)
|
(when (file-directory-p package-user-dir)
|
||||||
(delete-directory package-user-dir t)))
|
(delete-directory package-user-dir t)))
|
||||||
t)))
|
(when success
|
||||||
|
(doom--finalize-straight)
|
||||||
|
t)))))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue