diff --git a/README.md b/README.md index 1df7fce..a67704b 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ simplicity, showing information only when it's relevant. It currently shows: - Current Python virtualenv -- Current Ruby version using Rbenv; version and gemset when on RVM +- Current Ruby version using Rbenv or chruby; version and gemset when on RVM - Current Node.js version, through NVM - Git status - Timestamp diff --git a/bullet-train.zsh-theme b/bullet-train.zsh-theme index 4b3f006..919b5d7 100644 --- a/bullet-train.zsh-theme +++ b/bullet-train.zsh-theme @@ -337,19 +337,20 @@ prompt_dir() { # RUBY # RVM: only shows RUBY info if on a gemset that is not the default one # RBENV: shows current ruby version active in the shell +# CHRUBY: shows current ruby version active in the shell prompt_ruby() { if [[ $BULLETTRAIN_RUBY_SHOW == false ]]; then return fi - if which rvm-prompt &> /dev/null; then + if command -v rvm-prompt > /dev/null 2>&1; then if [[ ! -n $(rvm gemset list | grep "=> (default)") ]] then prompt_segment $BULLETTRAIN_RUBY_BG $BULLETTRAIN_RUBY_FG $BULLETTRAIN_RUBY_PREFIX" $(rvm-prompt i v g)" fi - elif which chruby &> /dev/null; then + elif command -v chruby > /dev/null 2>&1; then prompt_segment $BULLETTRAIN_RUBY_BG $BULLETTRAIN_RUBY_FG $BULLETTRAIN_RUBY_PREFIX" $(chruby | sed -e 's/ \* //')" - elif which rbenv &> /dev/null; then + elif command -v rbenv > /dev/null 2>&1; then prompt_segment $BULLETTRAIN_RUBY_BG $BULLETTRAIN_RUBY_FG $BULLETTRAIN_RUBY_PREFIX" $(rbenv version | sed -e 's/ (set.*$//')" fi }