tyler.durden
/
powerline
mirror of https://github.com/powerline/powerline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename `POWERLINE_CONFIG` to `POWERLINE_CONFIG_OVERRIDES` 

Fixes #1124
Ref #1126
This commit is contained in:
ZyX 2015-01-06 16:19:47 +03:00
parent 2a2da9d43f
commit 16bf16478c
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/source/configuration/local.rst
View File

@ -73,7 +73,7 @@ Zsh/zpython overrides
Here overrides are controlled by similarly to the powerline script, but values Here overrides are controlled by similarly to the powerline script, but values
are taken from zsh variables. are taken from zsh variables.
``POWERLINE_CONFIG`` ``POWERLINE_CONFIG_OVERRIDES``
Overrides options from :file:`powerline/config.json`. Should be a zsh Overrides options from :file:`powerline/config.json`. Should be a zsh
associative array with keys equal to ``KEY.NESTED_KEY`` and values being associative array with keys equal to ``KEY.NESTED_KEY`` and values being
JSON strings. Pair ``KEY.KEY1 VALUE`` is equivalent to ``{"KEY": {"KEY1": JSON strings. Pair ``KEY.KEY1 VALUE`` is equivalent to ``{"KEY": {"KEY1":
@ -83,9 +83,10 @@ are taken from zsh variables.
``POWERLINE_THEME_CONFIG`` ``POWERLINE_THEME_CONFIG``
Overrides options from :file:`powerline/themes/shell/*.json`. Should be Overrides options from :file:`powerline/themes/shell/*.json`. Should be
a zsh associative array with keys equal to ``THEME_NAME.KEY.NESTED_KEY`` and a zsh associative array with keys equal to ``THEME_NAME.KEY.NESTED_KEY`` and
values being JSON strings. Is processed like the above ``POWERLINE_CONFIG``, values being JSON strings. Is processed like the above
but only subdictionaries for ``THEME_NAME`` key are merged with theme ``POWERLINE_CONFIG_OVERRIDES``, but only subdictionaries for ``THEME_NAME``
configuration when theme with given name is requested. key are merged with theme configuration when theme with given name is
requested.
``POWERLINE_CONFIG_PATHS`` ``POWERLINE_CONFIG_PATHS``
Sets directories where configuration should be read from. If present, no Sets directories where configuration should be read from. If present, no

2
powerline/bindings/zsh/__init__.py
View File

@ -37,7 +37,7 @@ class Args(object):
@property @property
def config(self): def config(self):
return get_var_config('POWERLINE_CONFIG') return get_var_config('POWERLINE_CONFIG_OVERRIDES')
@property @property
def theme_option(self): def theme_option(self):

6
tests/test_shells/input.zsh
View File

@ -8,8 +8,8 @@ if test -z "$POWERLINE_NO_ZSH_ZPYTHON" ; then
powerline-reload-config powerline-reload-config
} }
function set_theme() { function set_theme() {
typeset -A POWERLINE_CONFIG typeset -A POWERLINE_CONFIG_OVERRIDES
POWERLINE_CONFIG=( POWERLINE_CONFIG_OVERRIDES=(
ext.shell.theme $1 ext.shell.theme $1
) )
powerline-reload-config powerline-reload-config
@ -23,7 +23,7 @@ else
} }
fi fi
source powerline/bindings/zsh/powerline.zsh source powerline/bindings/zsh/powerline.zsh
typeset -gA POWERLINE_CONFIG POWERLINE_THEME_CONFIG typeset -gA POWERLINE_CONFIG_OVERRIDES POWERLINE_THEME_CONFIG
set_theme_option default_leftonly.segment_data.hostname.args.only_if_ssh false set_theme_option default_leftonly.segment_data.hostname.args.only_if_ssh false
set_theme_option default.segment_data.hostname.args.only_if_ssh false set_theme_option default.segment_data.hostname.args.only_if_ssh false
set_theme default_leftonly set_theme default_leftonly