From ba7069dca041db67d3d7ac92e7fde739f2eea837 Mon Sep 17 00:00:00 2001 From: MitchMarq42 Date: Wed, 22 Mar 2023 19:10:40 -0800 Subject: [PATCH] elpaca: bump installer version --- lisp/elpaca-bootstrap.el | 48 ++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/lisp/elpaca-bootstrap.el b/lisp/elpaca-bootstrap.el index 6357444..92593a1 100644 --- a/lisp/elpaca-bootstrap.el +++ b/lisp/elpaca-bootstrap.el @@ -4,7 +4,7 @@ ;; Taken from https://github.com/progfolio/elpaca ;;; Code: -(defvar elpaca-installer-version 0.2) +(defvar elpaca-installer-version 0.3) (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory)) (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory)) (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory)) @@ -12,27 +12,31 @@ :ref nil :files (:defaults (:exclude "extensions")) :build (:not elpaca--activate-package))) -(when-let ((repo (expand-file-name "elpaca/" elpaca-repos-directory)) - (build (expand-file-name "elpaca/" elpaca-builds-directory)) - (order (cdr elpaca-order)) - ((add-to-list 'load-path (if (file-exists-p build) build repo))) - ((not (file-exists-p repo)))) - (condition-case-unless-debug err - (if-let ((buffer (pop-to-buffer-same-window "*elpaca-installer*")) - ((zerop (call-process "git" nil buffer t "clone" - (plist-get order :repo) repo))) - (default-directory repo) - ((zerop (call-process "git" nil buffer t "checkout" - (or (plist-get order :ref) "--")))) - (emacs (concat invocation-directory invocation-name)) - ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch" - "--eval" "(byte-recompile-directory \".\" 0 'force)")))) - (progn (require 'elpaca) - (elpaca-generate-autoloads "elpaca" repo) - (kill-buffer buffer)) - (error "%s" (with-current-buffer buffer (buffer-string)))) - ((error) (warn "%s" err) (delete-directory repo 'recursive)))) -(require 'elpaca-autoloads) +(let* ((repo (expand-file-name "elpaca/" elpaca-repos-directory)) + (build (expand-file-name "elpaca/" elpaca-builds-directory)) + (order (cdr elpaca-order)) + (default-directory repo)) + (add-to-list 'load-path (if (file-exists-p build) build repo)) + (unless (file-exists-p repo) + (make-directory repo t) + (condition-case-unless-debug err + (if-let ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*")) + ((zerop (call-process "git" nil buffer t "clone" + (plist-get order :repo) repo))) + ((zerop (call-process "git" nil buffer t "checkout" + (or (plist-get order :ref) "--")))) + (emacs (concat invocation-directory invocation-name)) + ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch" + "--eval" "(byte-recompile-directory \".\" 0 'force)"))) + ((require 'elpaca)) + ((elpaca-generate-autoloads "elpaca" repo))) + (kill-buffer buffer) + (error "%s" (with-current-buffer buffer (buffer-string)))) + ((error) (warn "%s" err) (delete-directory repo 'recursive)))) + (unless (require 'elpaca-autoloads nil t) + (require 'elpaca) + (elpaca-generate-autoloads "elpaca" repo) + (load "./elpaca-autoloads"))) (add-hook 'after-init-hook #'elpaca-process-queues) (elpaca `(,@elpaca-order))