Skip to content

Commit 45d7019

Browse files
committed
Merge branch 'windows-bin'
2 parents 7fb50ef + 607cf07 commit 45d7019

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

python-environment.el

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,15 +162,17 @@ See `python-environment-make' for how ROOT is interpreted."
162162
(python-environment-root-path root))))
163163
(if (file-exists-p full-path)
164164
full-path
165-
(python-environment--existing (cdr paths))))))
165+
(apply #'python-environment--existing root (cdr paths))))))
166166

167167
(defun python-environment-bin (path &optional root)
168-
"Return full path to \"ROOT/bin/PATH\" or \"ROOT/Script/PATH\" if exists.
169-
``Script`` is used instead of ``bin`` in typical Windows case.
168+
"Return full path to \"ROOT/bin/PATH\" or \"ROOT/Scripts/PATH\" if exists.
169+
``Scripts`` is used instead of ``bin`` in typical Windows case.
170+
In Windows, path with extension \".ext\" may be returned.
170171
See `python-environment-make' for how ROOT is interpreted."
171172
(python-environment--existing root
172173
(concat "bin/" path)
173-
(concat "Script/" path)))
174+
(concat "Scripts/" path)
175+
(concat "Scripts/" path ".exe")))
174176

175177
(defun python-environment-lib (path &optional root)
176178
"Return full path to \"ROOT/lib/PATH\" or \"ROOT/Lib/PATH\" if exists.

0 commit comments

Comments
 (0)