Merge pull request #1123 from radian-software/rr-straight-bootstrap-v7

[#1120] Respect straight-base-dir in bootstrap
radian-software · Sep 30, 2023 · 8688486 · 8688486
2 parents 5e84c4e + 8341ae9
commit 8688486
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -183,8 +183,11 @@ First, place the following bootstrap code in your init-file:
 ```emacs-lisp
 (defvar bootstrap-version)
 (let ((bootstrap-file
- (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
- (bootstrap-version 6))
+ (expand-file-name
+ "straight/repos/straight.el/bootstrap.el"
+ (or (bound-and-true-p straight-base-dir)
+ user-emacs-directory)))
+ (bootstrap-version 7))
  (unless (file-exists-p bootstrap-file)
  (with-current-buffer
  (url-retrieve-synchronously
@@ -1421,8 +1424,11 @@ care of all these details for you:
 ```emacs-lisp
 (defvar bootstrap-version)
 (let ((bootstrap-file
- (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
- (bootstrap-version 6))
+ (expand-file-name
+ "straight/repos/straight.el/bootstrap.el"
+ (or (bound-and-true-p straight-base-dir)
+ user-emacs-directory)))
+ (bootstrap-version 7))
  (unless (file-exists-p bootstrap-file)
  (with-current-buffer
  (url-retrieve-synchronously

diff --git a/benchmark/straight-bench.el b/benchmark/straight-bench.el
@@ -246,8 +246,9 @@ SHALLOW nil means use the default behavior of full clones."
  (let ((bootstrap-file
  (expand-file-name
  "straight/repos/straight.el/bootstrap.el"
- user-emacs-directory))
- (bootstrap-version 6))
+ (or (bound-and-true-p straight-base-dir)
+ user-emacs-directory)))
+ (bootstrap-version 7))
  (unless (file-exists-p bootstrap-file)
  (with-current-buffer
  (url-retrieve-synchronously

diff --git a/straight.el b/straight.el
@@ -6997,9 +6997,11 @@ Interactively, or when MESSAGE is non-nil, show in the echo area."
 (defvar straight-bug-report--bootstrap
  '((defvar bootstrap-version)
  (let ((bootstrap-file
- (expand-file-name "straight/repos/straight.el/bootstrap.el"
- user-emacs-directory))
- (bootstrap-version 6))
+ (expand-file-name
+ "straight/repos/straight.el/bootstrap.el"
+ (or (bound-and-true-p straight-base-dir)
+ user-emacs-directory)))
+ (bootstrap-version 7))
  (unless (file-exists-p bootstrap-file)
  (with-current-buffer
  (url-retrieve-synchronously