mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-11-14 00:50:08 +00:00
Ease regex pattern when reading pyenv.cfg prompt value
This commit provides support for virtualenv-like pyenv.cfg configuration files, where the `prompt` value is a plain text rather than a quoted string. Before the commit, `prompt = My custom prompt` would not match the regex, returning a fallback of the $VIRTUAL_ENV directory name. After the commit, both venv-like `prompt = 'My custom prompt'` and virtualenv-like `prompt = My custom prompt` are supported. Closes #2628
This commit is contained in:
parent
da9b03777c
commit
d6a0fed1d9
1 changed files with 11 additions and 6 deletions
|
@ -4260,18 +4260,23 @@ function _p9k_parse_virtualenv_cfg() {
|
|||
typeset -ga reply=(0)
|
||||
[[ -f $1 && -r $1 ]] || return
|
||||
|
||||
local cfg
|
||||
cfg=$(<$1) || return
|
||||
local line res=""
|
||||
while IFS= read -r line; do
|
||||
if [[ "$line" =~ '^prompt[[:space:]]*=[[:space:]]*(.*)' ]]; then
|
||||
res="${match[1]}"
|
||||
break
|
||||
fi
|
||||
done < "$1"
|
||||
|
||||
# Return if res is empty, meaning no match was found
|
||||
[[ -z "$res" ]] && return
|
||||
|
||||
local -a match mbegin mend
|
||||
[[ $'\n'$cfg$'\n' == (#b)*$'\n'prompt[$' \t']#=[$' \t']#([^$' \t']#)[$' \t']#$'\n'* ]] || return
|
||||
local res=$match[1]
|
||||
if [[ $res == (\"*\"|\'*\') ]]; then
|
||||
# The string is quoted in python style, which isn't the same as quoting in zsh.
|
||||
# For example, the literal 'foo"\'bar' denotes foo"'bar in python but in zsh
|
||||
# it is malformed.
|
||||
#
|
||||
# We cheat a bit and impelement not exactly correct unquoting. It may produce
|
||||
# We cheat a bit and implement not exactly correct unquoting. It may produce
|
||||
# different visual results but won't perform unintended expansions or bleed out
|
||||
# any escape sequences.
|
||||
#
|
||||
|
|
Loading…
Reference in a new issue