emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Have package manager manage straight.el

Browse source 
We used a clumsy hack in `doom--ensure-straight` to delete straight if
its pinned commit didn't match the current one, to force it to be
reinstalled. With this, Doom's package manager will delete/update
straight like any other package.
This commit is contained in:
Henrik Lissner 2020-05-25 15:58:28 -04:00
parent 0bc3f8ea87
commit fe7df725f6
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/core-packages.el
View file

@ -118,14 +118,8 @@ uses a straight or package.el command directly).")
(or (plist-get recipe :repo) "raxod502/straight.el"))) (or (plist-get recipe :repo) "raxod502/straight.el")))
(branch (or (plist-get recipe :branch) straight-repository-branch)) (branch (or (plist-get recipe :branch) straight-repository-branch))
(call (if doom-debug-p #'doom-exec-process #'doom-call-process))) (call (if doom-debug-p #'doom-exec-process #'doom-call-process)))
(if (not (file-directory-p repo-dir))
(message "Installing straight...")
;; TODO Rethink this clumsy workaround
(let ((default-directory repo-dir))
(unless (equal (cdr (doom-call-process "git" "rev-parse" "HEAD")) pin)
(delete-directory repo-dir 'recursive)
(message "Updating straight..."))))
(unless (file-directory-p repo-dir) (unless (file-directory-p repo-dir)
(message "Installing straight...")
(cond (cond
((eq straight-vc-git-default-clone-depth 'full) ((eq straight-vc-git-default-clone-depth 'full)
(funcall call "git" "clone" "--origin" "origin" repo-url repo-dir)) (funcall call "git" "clone" "--origin" "origin" repo-url repo-dir))
@ -405,11 +399,10 @@ ones."
"Return straight recipes for non-builtin packages with a local-repo." "Return straight recipes for non-builtin packages with a local-repo."
(let (recipes) (let (recipes)
(dolist (recipe (hash-table-values straight--recipe-cache)) (dolist (recipe (hash-table-values straight--recipe-cache))
(cl-destructuring-bind (&key local-repo type no-build &allow-other-keys) (cl-destructuring-bind (&key local-repo type &allow-other-keys)
recipe recipe
(unless (or (null local-repo) (unless (or (null local-repo)
(eq type 'built-in) (eq type 'built-in))
no-build)
(push recipe recipes)))) (push recipe recipes))))
(nreverse recipes))) (nreverse recipes)))