diff options
author | Andrew Janke <andrew@apjanke.net> | 2015-09-03 13:05:24 -0400 |
---|---|---|
committer | Andrew Janke <andrew@apjanke.net> | 2015-09-03 13:05:24 -0400 |
commit | 93b4a6c02eeafb875de5d9bcccd73bdcd8265f40 (patch) | |
tree | 7cc87fcd416bf71cee77f30bf2e60cf607671f43 /themes/candy-kingdom.zsh-theme | |
parent | 689b5ab3c8c8bf30ee63cafb8401d7d95e41f359 (diff) | |
parent | 0532860c618aabc02d5dab34391b967e8e4c6272 (diff) | |
download | zsh-93b4a6c02eeafb875de5d9bcccd73bdcd8265f40.tar.gz zsh-93b4a6c02eeafb875de5d9bcccd73bdcd8265f40.tar.bz2 zsh-93b4a6c02eeafb875de5d9bcccd73bdcd8265f40.zip |
Merge branch 'master' into osx-fix-tab-for-iterm
Conflicts:
plugins/osx/osx.plugin.zsh
Diffstat (limited to 'themes/candy-kingdom.zsh-theme')
-rw-r--r-- | themes/candy-kingdom.zsh-theme | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/themes/candy-kingdom.zsh-theme b/themes/candy-kingdom.zsh-theme index adba1ad39..9d2103926 100644 --- a/themes/candy-kingdom.zsh-theme +++ b/themes/candy-kingdom.zsh-theme @@ -13,7 +13,7 @@ patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset } function box_name { - [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-HOST} + [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST} } PROMPT=' |