Skip to content

Fix path on MS Windows #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qwerbzuio wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix path on MS Windows #84

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55e360d
Remove duplicate directory-separator
qwerbzuio Feb 24, 2019
a1559b9
Use path-separator
qwerbzuio Feb 24, 2019
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
10 changes: 5 additions & 5 deletions pyvenv.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,11 @@ This is usually the base name of `pyvenv-virtual-env'.")
(run-hooks 'pyvenv-pre-activate-hooks)
(let ((new-directories (append
;; Unix
(when (file-exists-p (format "%s/bin" directory))
(list (format "%s/bin" directory)))
(when (file-exists-p (expand-file-name "bin" directory))
(list (expand-file-name "bin" directory)))
;; Windows
(when (file-exists-p (format "%s/Scripts" directory))
(list (format "%s/Scripts" directory)
(when (file-exists-p (expand-file-name "Scripts" directory))
(list (expand-file-name "Scripts" directory)
;; Apparently, some virtualenv
;; versions on windows put the
;; python.exe in the virtualenv root
Expand All @@ -231,7 +231,7 @@ This is usually the base name of `pyvenv-virtual-env'.")
;; but not to `process-environment'?
exec-path (append new-directories exec-path)
;; set eshell path to same as exec-path
eshell-path-env (mapconcat 'identity exec-path ":")
eshell-path-env (mapconcat 'identity exec-path path-separator)
process-environment (append
(list
(format "VIRTUAL_ENV=%s" directory)
Expand Down