From c1475ba6ae1cdf95ac65432f2e58867780be7485 Mon Sep 17 00:00:00 2001 From: Wang Kai Date: Sun, 13 Dec 2020 02:21:06 +0800 Subject: [PATCH] Add `pyenv version-name` (#391) see: #109 --- doom-modeline-env.el | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/doom-modeline-env.el b/doom-modeline-env.el index 0a7e1c0..1dc828e 100644 --- a/doom-modeline-env.el +++ b/doom-modeline-env.el @@ -196,17 +196,17 @@ PARSER should be a function for parsing COMMAND's output line-by-line, to (doom-modeline-def-env python :hooks 'python-mode-hook :command (lambda () (cond ((and (fboundp 'pipenv-project-p) - (pipenv-project-p)) - (list "pipenv" "run" - (or doom-modeline-env-python-executable - python-shell-interpreter - "python") - "--version")) - ((list (or doom-modeline-env-python-executable - python-shell-interpreter - "python") - "--version")))) - :parser (lambda (line) (cadr (split-string line)))) + (pipenv-project-p)) + (list "pipenv" "run")) + ((executable-find "pyenv") (list "pyenv" "version-name")) + ((list (or doom-modeline-env-python-executable + python-shell-interpreter + "python") + "--version")))) + :parser (lambda (line) (let ((version (split-string line))) + (if (>= (length version) 2) + (cadr version) + (car version))))) ;;;###autoload (autoload 'doom-modeline-env-setup-ruby "doom-modeline-env") (doom-modeline-def-env ruby