Update elpaca bootstrap

This commit is contained in:
MitchMarq42 2023-02-23 11:34:17 -09:00
parent be5faac2bb
commit 812a6e2580

View File

@ -4,37 +4,35 @@
;; Taken from https://github.com/progfolio/elpaca ;; Taken from https://github.com/progfolio/elpaca
;;; Code: ;;; Code:
(defvar elpaca-installer-version 0.2)
(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory)) (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory)) (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
(defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git" (defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git"
:ref nil :ref nil
:files (:defaults (:exclude "extensions"))
:build (:not elpaca--activate-package))) :build (:not elpaca--activate-package)))
(when-let ((repo (expand-file-name "repos/elpaca/" elpaca-directory)) (when-let ((repo (expand-file-name "elpaca/" elpaca-repos-directory))
(build (expand-file-name "elpaca/" elpaca-builds-directory)) (build (expand-file-name "elpaca/" elpaca-builds-directory))
(order (cdr elpaca-order)) (order (cdr elpaca-order))
((add-to-list 'load-path (if (file-exists-p build) build repo))) ((add-to-list 'load-path (if (file-exists-p build) build repo)))
((not (file-exists-p repo))) ((not (file-exists-p repo))))
(buffer (get-buffer-create "*elpaca-bootstrap*")))
(condition-case-unless-debug err (condition-case-unless-debug err
(if-let (((pop-to-buffer buffer '((display-buffer-reuse-window (if-let ((buffer (pop-to-buffer-same-window "*elpaca-installer*"))
display-buffer-same-window))))
((zerop (call-process "git" nil buffer t "clone" ((zerop (call-process "git" nil buffer t "clone"
(plist-get order :repo) repo))) (plist-get order :repo) repo)))
(default-directory repo) (default-directory repo)
((zerop (call-process "git" nil buffer t "checkout" ((zerop (call-process "git" nil buffer t "checkout"
(or (plist-get order :ref) "--"))))) (or (plist-get order :ref) "--"))))
(progn (emacs (concat invocation-directory invocation-name))
(byte-recompile-directory repo 0 'force) ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch"
(require 'elpaca) "--eval" "(byte-recompile-directory \".\" 0 'force)"))))
(and (fboundp 'elpaca-generate-autoloads) (progn (require 'elpaca)
(elpaca-generate-autoloads "elpaca" repo)) (elpaca-generate-autoloads "elpaca" repo)
(kill-buffer buffer)) (kill-buffer buffer))
(error "%s" (with-current-buffer buffer (buffer-string)))) (error "%s" (with-current-buffer buffer (buffer-string))))
((error) ((error) (warn "%s" err) (delete-directory repo 'recursive))))
(warn "%s" err)
(delete-directory repo 'recursive))))
(require 'elpaca-autoloads) (require 'elpaca-autoloads)
(add-hook 'after-init-hook #'elpaca-process-queues) (add-hook 'after-init-hook #'elpaca-process-queues)
(elpaca `(,@elpaca-order)) (elpaca `(,@elpaca-order))
(provide 'elpaca-bootstrap)
;;; elpaca-bootstrap.el ends here ;;; elpaca-bootstrap.el ends here