From bc8a83208f9b4aa8fcc29cc35a0eeec3ae67c5b9 Mon Sep 17 00:00:00 2001 From: dinhnv Date: Wed, 22 Nov 2017 11:30:24 +0700 Subject: pyenv promt segment uses $PYENV_VERSION environment variable" --- powerlevel9k.zsh-theme | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'powerlevel9k.zsh-theme') diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 73178865..b65c2077 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -1379,18 +1379,10 @@ prompt_virtualenv() { } # pyenv: current active python version (with restrictions) -# More information on pyenv (Python version manager like rbenv and rvm): -# https://github.com/yyuu/pyenv -# the prompt parses output of pyenv version and only displays the first word +# https://github.com/pyenv/pyenv#choosing-the-python-version prompt_pyenv() { - local pyenv_version="$(pyenv version 2>/dev/null)" - pyenv_version="${pyenv_version%% *}" - # XXX: The following should return the same as above. - # This reads better for devs familiar with sed/awk/grep/cut utilities - # Using shell expansion/substitution may hamper future maintainability - #local pyenv_version="$(pyenv version 2>/dev/null | head -n1 | cut -d' ' -f1)" - if [[ -n "$pyenv_version" && "$pyenv_version" != "system" ]]; then - "$1_prompt_segment" "$0" "$2" "blue" "$DEFAULT_COLOR" "$pyenv_version" 'PYTHON_ICON' + if [[ -n "$PYENV_VERSION" ]]; then + "$1_prompt_segment" "$0" "$2" "blue" "$DEFAULT_COLOR" "$PYENV_VERSION" 'PYTHON_ICON' fi } -- cgit v1.2.3 From 6e931f6047994ebb4a83924c298678d059e183d4 Mon Sep 17 00:00:00 2001 From: Torben Hartmann Date: Mon, 27 Nov 2017 21:38:03 +0100 Subject: Fixed Issue with whitespaces in path. --- powerlevel9k.zsh-theme | 3 +++ 1 file changed, 3 insertions(+) (limited to 'powerlevel9k.zsh-theme') diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 73178865..5dd394ea 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -695,7 +695,10 @@ set_default POWERLEVEL9K_DIR_PATH_SEPARATOR "/" set_default POWERLEVEL9K_HOME_FOLDER_ABBREVIATION "~" set_default POWERLEVEL9K_DIR_SHOW_WRITABLE false prompt_dir() { + local tmp=$IFS + local IFS="" local current_path=$(pwd | sed -e "s,^$HOME,~,") + local IFS=$tmp if [[ -n "$POWERLEVEL9K_SHORTEN_DIR_LENGTH" || "$POWERLEVEL9K_SHORTEN_STRATEGY" == "truncate_with_folder_marker" ]]; then set_default POWERLEVEL9K_SHORTEN_DELIMITER $'\U2026' -- cgit v1.2.3 From 02fbaf2c4befcc9a291f391a1a045d1a055332c0 Mon Sep 17 00:00:00 2001 From: Torben Hartmann Date: Tue, 5 Dec 2017 17:30:49 +0100 Subject: IFS Fix attemp --- powerlevel9k.zsh-theme | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'powerlevel9k.zsh-theme') diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 5dd394ea..fb344f25 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -695,10 +695,10 @@ set_default POWERLEVEL9K_DIR_PATH_SEPARATOR "/" set_default POWERLEVEL9K_HOME_FOLDER_ABBREVIATION "~" set_default POWERLEVEL9K_DIR_SHOW_WRITABLE false prompt_dir() { - local tmp=$IFS + local tmp="$IFS" local IFS="" local current_path=$(pwd | sed -e "s,^$HOME,~,") - local IFS=$tmp + local IFS="$tmp" if [[ -n "$POWERLEVEL9K_SHORTEN_DIR_LENGTH" || "$POWERLEVEL9K_SHORTEN_STRATEGY" == "truncate_with_folder_marker" ]]; then set_default POWERLEVEL9K_SHORTEN_DELIMITER $'\U2026' -- cgit v1.2.3