mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-11-16 09:50:06 +00:00
Merge remote-tracking branch 'opes/chruby_options' into staging_065
This commit is contained in:
commit
3456af3aac
2 changed files with 28 additions and 4 deletions
11
README.md
11
README.md
|
@ -266,6 +266,17 @@ Some example settings:
|
|||
| Normal Colors | `(red3 darkorange3 darkgoldenrod gold3 yellow3 chartreuse2 mediumspringgreen green3 green3 green4 darkgreen)` |
|
||||
| Subdued Colors | `(darkred orange4 yellow4 yellow4 chartreuse3 green3 green4 darkgreen)` |
|
||||
|
||||
##### chruby
|
||||
|
||||
This segment shows the version of Ruby being used when using `chruby` to change your current Ruby stack.
|
||||
|
||||
It uses `$RUBY_ENGINE` and `$RUBY_VERSION` as set by `chruby`.
|
||||
|
||||
| Variable | Default Value | Description |
|
||||
|----------|---------------|-------------|
|
||||
|`POWERLEVEL9K_CHRUBY_SHOW_ENGINE`|true|Show the currently selected Ruby engine (e.g. `ruby`, `jruby`, `rbx`, etc)
|
||||
|`POWERLEVEL9K_CHRUBY_SHOW_VERSION`|true|Shows the currently selected engine's version (e.g. `2.5.1`)
|
||||
|
||||
##### command_execution_time
|
||||
|
||||
Display the time the previous command took to execute if the time is above
|
||||
|
|
|
@ -1252,11 +1252,24 @@ prompt_rbenv() {
|
|||
# Segment to display chruby information
|
||||
# see https://github.com/postmodern/chruby/issues/245 for chruby_auto issue with ZSH
|
||||
prompt_chruby() {
|
||||
local chruby_env
|
||||
chrb_env="$(chruby 2> /dev/null | grep \* | tr -d '* ')"
|
||||
# Uses $RUBY_VERSION and $RUBY_ENGINE set by chruby
|
||||
set_default POWERLEVEL9K_CHRUBY_SHOW_VERSION true
|
||||
set_default POWERLEVEL9K_CHRUBY_SHOW_ENGINE true
|
||||
local chruby_label=""
|
||||
|
||||
if [[ "$POWERLEVEL9K_CHRUBY_SHOW_ENGINE" == true ]]; then
|
||||
chruby_label+="$RUBY_ENGINE "
|
||||
fi
|
||||
if [[ "$POWERLEVEL9K_CHRUBY_SHOW_VERSION" == true ]]; then
|
||||
chruby_label+="$RUBY_VERSION"
|
||||
fi
|
||||
|
||||
# Truncate trailing spaces
|
||||
chruby_label="${chruby_label%"${chruby_label##*[![:space:]]}"}"
|
||||
|
||||
# Don't show anything if the chruby did not change the default ruby
|
||||
if [[ "${chrb_env:-system}" != "system" ]]; then
|
||||
"$1_prompt_segment" "$0" "$2" "red" "$DEFAULT_COLOR" "${chrb_env}" 'RUBY_ICON'
|
||||
if [[ "$RUBY_ENGINE" != "" ]]; then
|
||||
"$1_prompt_segment" "$0" "$2" "red" "$DEFAULT_COLOR" "${chruby_label}" 'RUBY_ICON'
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue