Bootstrap straight.el on Windows by, just, git cloning it

1 files changed, 28 insertions, 13 deletions

@@ -39,21 +39,36 @@ Let’s configure Emacs using Org mode, they said.  It’ll be fun, they said.
 
 *** Straight.el
 
-This still doesn’t work under Windows – I have to manually download the [[https://github.com/raxod502/straight.el/archive/master.zip][repo archive]] and unzip it.  Not the biggest burden, I suppose.
+Since for whatever reason, Straight can't bootstrap itself on Windows
+-- I've wrapped it in a function here and added the direct git command
+when it errors.
 
  #+begin_src emacs-lisp
-   (defvar bootstrap-version)
-   (let ((bootstrap-file
-          (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
-         (bootstrap-version 5))
-     (unless (file-exists-p bootstrap-file)
-       (with-current-buffer
-           (url-retrieve-synchronously
-            "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
-            'silent 'inhibit-cookies)
-         (goto-char (point-max))
-         (eval-print-last-sexp)))
-     (load bootstrap-file nil 'nomessage))
+   (defun acdw/bootstrap-straight ()
+     (defvar bootstrap-version)
+                          (let ((bootstrap-file
+                                 (expand-file-name
+                                  "straight/repos/straight.el/bootstrap.el"
+                                  user-emacs-directory))
+                                (bootstrap-version 5))
+                            (unless (file-exists-p bootstrap-file)
+                              (with-current-buffer
+                                  (url-retrieve-synchronously
+                                   (concat "https://raw.githubusercontent.com/"
+                                           "raxod502/straight.el/develop/install.el")
+                                   'silent 'inhibit-cookies)
+                                (goto-char (point-max))
+                                (eval-print-last-sexp)))
+                            (load bootstrap-file nil 'nomessage)))
+
+   (unless (ignore-errors (acdw/bootstrap-straight))
+     (message "Straight.el didn't bootstrap correctly.  Cloning directly...")
+     (call-process "git" nil (get-buffer-create "*bootstrap-straight-messages*") nil
+                   "clone"
+                   "https://github.com/raxod502/straight.el"
+                   (expand-file-name "straight/repos/straight.el"
+                                     user-emacs-directory))
+     (acdw/bootstrap-straight))
  #+end_src
 
 *** Use-package