Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
* fix(lisp): Fix line containing format placeholders ([#377](../../pull/377))
* feat: Add `root` command ([`2a3872b`](../../commit/2a3872b0ac842268eb69cca403ab3ad8cda72a21))
* fix(lisp/emacs): Respect Eask file settings when possible ([`1b5aaa1`](../../commit/1b5aaa121b5d6a39e3a0664006fc10a4b22c2e84))
* fix(lisp): Let buttercup tests handle exit code themselves ([#385](../../pull/385))
* fix(lisp): Set up paths regardless of the working environment ([#386](../../pull/386))

## 0.12.x
> Released Dec 02, 2025
Expand Down
20 changes: 14 additions & 6 deletions lisp/_prepare.el
Original file line number Diff line number Diff line change
Expand Up @@ -612,11 +612,14 @@ Arguments FNC and ARGS are used for advice `:around'."

(defun eask--update-exec-path ()
"Add all bin directory to the variable `exec-path'."
(dolist (entry (directory-files package-user-dir t directory-files-no-dot-files-regexp))
(when-let* ((bin (expand-file-name "bin" entry))
((file-directory-p bin)))
(add-to-list 'exec-path bin t)))
(delete-dups exec-path))
(when-let* (((file-exists-p package-user-dir))
(entries (directory-files package-user-dir
t directory-files-no-dot-files-regexp)))
(dolist (entry entries)
(when-let* ((bin (expand-file-name "bin" entry))
((file-directory-p bin)))
(add-to-list 'exec-path bin t)))
(delete-dups exec-path)))

(defun eask--update-load-path ()
"Add all .el files to the variable `load-path'."
Expand Down Expand Up @@ -702,7 +705,8 @@ scope of the dependencies (it's either `production' or `development')."
(eask-with-progress
(ansi-green "Updating environment variables... ")
(eask-with-verbosity 'debug
(eask--update-exec-path) (eask--update-load-path)
(eask--update-exec-path)
(eask--update-load-path)
(setenv "PATH" (string-join exec-path path-separator))
(setenv "EMACSLOADPATH" (string-join load-path path-separator)))
(ansi-green "done ✓")))
Expand Down Expand Up @@ -1385,6 +1389,8 @@ This uses function `locate-dominating-file' to look up directory tree."
(eask-msg "✗ Loading config Eask file... missing!"))
(eask-msg ""))
(package-activate-all)
(ignore-errors (make-directory package-user-dir t))
(eask--silent (eask-setup-paths))
(eask--load-config)
(eask--with-hooks ,@body)))
((eask-global-p)
Expand All @@ -1400,6 +1406,7 @@ This uses function `locate-dominating-file' to look up directory tree."
(eask-msg ""))
(package-activate-all)
(ignore-errors (make-directory package-user-dir t))
(eask--silent (eask-setup-paths))
(eask-with-verbosity 'debug (eask--load-config))
(eask--with-hooks ,@body))))
((eask-special-p) ; Commands without Eask-file needed!
Expand All @@ -1419,6 +1426,7 @@ This uses function `locate-dominating-file' to look up directory tree."
(eask-msg ""))
(package-activate-all)
(ignore-errors (make-directory package-user-dir t))
(eask--silent (eask-setup-paths))
(eask-with-verbosity 'debug (eask--load-config))
(eask--with-hooks ,@body))))
(t
Expand Down
2 changes: 1 addition & 1 deletion lisp/core/exec-path.el
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
(mapc #'eask-exec-path--print exec-path)
(if (zerop (length exec-path))
(eask-info "(No exec-path found)")
(eask-info "(Total of %s exec-path)" (length exec-path)))))
(eask-info "(Total of %s `exec-path` printed)" (length exec-path)))))

;;; core/exec-path.el ends here
2 changes: 1 addition & 1 deletion lisp/core/load-path.el
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
(mapc #'eask-load-path--print load-path)
(if (zerop (length load-path))
(eask-info "(No load-path found)")
(eask-info "(Total of %s load-path)" (length load-path)))))
(eask-info "(Total of %s `load-path` printed)" (length load-path)))))

;;; core/load-path.el ends here