diff options
| author | Robby Russell <robby@planetargon.com> | 2014-06-30 21:00:53 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2014-06-30 21:00:53 -0700 |
| commit | 4131a59d1a57d53bf711115317116a6c57483636 (patch) | |
| tree | c3b2a746fdc18708b4c18b33c4475f20bf9d4e61 /themes/Soliah.zsh-theme | |
| parent | 3913106b2e7127d396f27b652df812340ec0c871 (diff) | |
| parent | 08632bb1780d51f6748b5c09ef5232862313f78f (diff) | |
| download | zsh-4131a59d1a57d53bf711115317116a6c57483636.tar.gz zsh-4131a59d1a57d53bf711115317116a6c57483636.tar.bz2 zsh-4131a59d1a57d53bf711115317116a6c57483636.zip | |
Merge pull request #2827 from ncanceill/easymerge
...you folks are amazing. :-)
"Easy-to-merge"
Diffstat (limited to 'themes/Soliah.zsh-theme')
| -rw-r--r-- | themes/Soliah.zsh-theme | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/themes/Soliah.zsh-theme b/themes/Soliah.zsh-theme index 237e70fda..070c54981 100644 --- a/themes/Soliah.zsh-theme +++ b/themes/Soliah.zsh-theme @@ -32,11 +32,12 @@ function check_git_prompt_info() { # Determine if we are using a gemset. function rvm_gemset() { - GEMSET=`rvm gemset list | grep '=>' | cut -b4-` - if [[ -n $GEMSET ]]; then - echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|" - fi - + if hash rvm 2>/dev/null; then + GEMSET=`rvm gemset list | grep '=>' | cut -b4-` + if [[ -n $GEMSET ]]; then + echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|" + fi + fi } # Determine the time since last commit. If branch is clean, |