Skip to content

Commit

Permalink
Merge pull request #1122 from radian-software/rr-bootstrap-more-logs
Browse files Browse the repository at this point in the history
[#1118] More logs on failed bootstrap
  • Loading branch information
raxod502 committed Sep 30, 2023
2 parents bfe8dca + dd8cbc9 commit e0f3ba8
Showing 1 changed file with 25 additions and 18 deletions.
43 changes: 25 additions & 18 deletions install.el
Original file line number Diff line number Diff line change
Expand Up @@ -244,23 +244,30 @@
(let ((temp-file (make-temp-file "straight.el~")))
(write-region nil nil temp-file nil 'silent)
(with-temp-buffer
(unless (= 0
(call-process
;; Taken with love from package `restart-emacs'.
(let ((emacs-binary-path
(expand-file-name
invocation-name invocation-directory))
(runemacs-binary-path
(when (straight--windows-os-p)
(expand-file-name
"runemacs.exe" invocation-directory))))
(if (and runemacs-binary-path
(file-exists-p runemacs-binary-path))
runemacs-binary-path
emacs-binary-path))
nil '(t t) nil
"--batch" "--no-window-system" "--quick"
"--load" temp-file))
(error "straight.el bootstrap failed: %s" (buffer-string)))))))
(let ((exit-status
(call-process
;; Taken with love from package `restart-emacs'.
(let ((emacs-binary-path
(expand-file-name
invocation-name invocation-directory))
(runemacs-binary-path
(when (straight--windows-os-p)
(expand-file-name
"runemacs.exe" invocation-directory))))
(if (and runemacs-binary-path
(file-exists-p runemacs-binary-path))
runemacs-binary-path
emacs-binary-path))
nil '(t t) nil
"--batch" "--no-window-system" "--quick"
"--load" temp-file)))
(unless (= 0 exit-status)
(message
(concat
"straight.el bootstrap failed with status %s, "
"subprocess logs follow:\n------%s\n------")
exit-status
(buffer-string))
(error "straight.el bootstrap failed, see *Messages*")))))))

(message "Bootstrapping straight.el...done"))

0 comments on commit e0f3ba8

Please sign in to comment.