diff options
| author | Case Duckworth | 2021-03-01 12:12:48 -0600 |
|---|---|---|
| committer | Case Duckworth | 2021-03-01 12:12:48 -0600 |
| commit | ce103be2187cd74cc71a353db69215d120091067 (patch) | |
| tree | 29be6f9fd42b4b7af0ba10a04b128e1186faaee3 | |
| parent | Typos (diff) | |
| download | emacs-ce103be2187cd74cc71a353db69215d120091067.tar.gz emacs-ce103be2187cd74cc71a353db69215d120091067.zip | |
Don't be smart about bootstrapping straight.el
| -rw-r--r-- | early-init.el | 41 |
1 files changed, 15 insertions, 26 deletions
| diff --git a/early-init.el b/early-init.el index dd09f16..dc91cba 100644 --- a/early-init.el +++ b/early-init.el | |||
| @@ -213,32 +213,21 @@ | |||
| 213 | (gitlab . "acdw")) | 213 | (gitlab . "acdw")) |
| 214 | straight-base-dir acdw/var-dir) | 214 | straight-base-dir acdw/var-dir) |
| 215 | 215 | ||
| 216 | ;; Run `straight''s bootstrap code, after gitting the code directly. | 216 | ;; Run `straight''s bootstrap code |
| 217 | (if (not (executable-find "git")) | 217 | (defvar bootstrap-version) |
| 218 | (error "No 'git' in $PATH!") | 218 | (let ((bootstrap-file |
| 219 | (call-process "git" nil | 219 | (expand-file-name |
| 220 | (get-buffer-create "*bootstrap-straight-messages*") | 220 | "repos/straight.el/bootstrap.el" |
| 221 | nil | 221 | straight-base-dir)) |
| 222 | "clone" | 222 | (bootstrap-version 5)) |
| 223 | "https://github.com/raxod502/straight.el" | 223 | (unless (file-exists-p bootstrap-file) |
| 224 | (expand-file-name "repos/straight.el" | 224 | (with-current-buffer |
| 225 | straight-base-dir)) | 225 | (url-retrieve-synchronously |
| 226 | (defvar bootstrap-version) | 226 | "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el" |
| 227 | (let ((bootstrap-file | 227 | 'silent 'inhibit-cookies) |
| 228 | (expand-file-name | 228 | (goto-char (point-max)) |
| 229 | "repos/straight.el/bootstrap.el" | 229 | (eval-print-last-sexp))) |
| 230 | straight-base-dir)) | 230 | (load bootstrap-file nil 'nomessage)) |
| 231 | (bootstrap-version 5)) | ||
| 232 | (unless (file-exists-p bootstrap-file) | ||
| 233 | (with-current-buffer | ||
| 234 | (url-retrieve-synchronously | ||
| 235 | (concat | ||
| 236 | "https://raw.githubusercontent.com/" | ||
| 237 | "raxod502/straight.el/develop/install.el") | ||
| 238 | 'silent 'inhibit-cookies) | ||
| 239 | (goto-char (point-max)) | ||
| 240 | (eval-print-last-sexp))) | ||
| 241 | (load bootstrap-file nil 'nomessage))) | ||
| 242 | 231 | ||
| 243 | 232 | ||
| 244 | ;; `use-package' | 233 | ;; `use-package' |