Merge pull request #116 from LACabeza/master

Allow change the context hostname to display the fqdn.
This commit is contained in:
Caio Gondim
2016-04-09 17:21:56 +02:00
2 changed files with 5 additions and 1 deletions

View File

@@ -159,6 +159,7 @@ more details.
|`BULLETTRAIN_CONTEXT_BG`|`black`|Background color |`BULLETTRAIN_CONTEXT_BG`|`black`|Background color
|`BULLETTRAIN_CONTEXT_FG`|`default`|Foreground color |`BULLETTRAIN_CONTEXT_FG`|`default`|Foreground color
|`BULLETTRAIN_CONTEXT_DEFAULT_USER`|none|Default user. If you are running with other user other than default, the segment will be showed. |`BULLETTRAIN_CONTEXT_DEFAULT_USER`|none|Default user. If you are running with other user other than default, the segment will be showed.
|`BULLETTRAIN_CONTEXT_HOSTNAME`|`%m`|Hostname. Set %M to display the full qualified domain name.
|`BULLETTRAIN_IS_SSH_CLIENT`|none|If `true`, the segment will be showed. |`BULLETTRAIN_IS_SSH_CLIENT`|none|If `true`, the segment will be showed.
### Python virtualenv (+Pyenv) ### Python virtualenv (+Pyenv)

View File

@@ -215,6 +215,9 @@ fi
if [ ! -n "${BULLETTRAIN_CONTEXT_FG+1}" ]; then if [ ! -n "${BULLETTRAIN_CONTEXT_FG+1}" ]; then
BULLETTRAIN_CONTEXT_FG=default BULLETTRAIN_CONTEXT_FG=default
fi fi
if [ ! -n "${BULLETTRAIN_CONTEXT_HOSTNAME+1}" ]; then
BULLETTRAIN_CONTEXT_HOSTNAME=%m
fi
# GIT PROMPT # GIT PROMPT
if [ ! -n "${BULLETTRAIN_GIT_PREFIX+1}" ]; then if [ ! -n "${BULLETTRAIN_GIT_PREFIX+1}" ]; then
@@ -342,7 +345,7 @@ prompt_end() {
# Context: user@hostname (who am I and where am I) # Context: user@hostname (who am I and where am I)
context() { context() {
local user="$(whoami)" local user="$(whoami)"
[[ "$user" != "$BULLETTRAIN_CONTEXT_DEFAULT_USER" || -n "$BULLETTRAIN_IS_SSH_CLIENT" ]] && echo -n "${user}@%m" [[ "$user" != "$BULLETTRAIN_CONTEXT_DEFAULT_USER" || -n "$BULLETTRAIN_IS_SSH_CLIENT" ]] && echo -n "${user}@$BULLETTRAIN_CONTEXT_HOSTNAME"
} }
prompt_context() { prompt_context() {
[[ $BULLETTRAIN_CONTEXT_SHOW == false ]] && return [[ $BULLETTRAIN_CONTEXT_SHOW == false ]] && return