diff options
| author | Robby Russell <robby@planetargon.com> | 2014-12-14 16:32:11 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2014-12-14 16:32:11 -0800 |
| commit | eced76e0fd80e6ca3908fb50b7e29c6beb4fad8b (patch) | |
| tree | 4647cececb4c7369a63b5a1f77f3cbc1c0b4a2e5 /plugins/svn-fast-info/svn-fast-info.plugin.zsh | |
| parent | 311f3630d4752139524941298371f9623d493b31 (diff) | |
| parent | 00ec11d3c0a2b2b7413ad84940ddec299aafbb04 (diff) | |
| download | zsh-eced76e0fd80e6ca3908fb50b7e29c6beb4fad8b.tar.gz zsh-eced76e0fd80e6ca3908fb50b7e29c6beb4fad8b.tar.bz2 zsh-eced76e0fd80e6ca3908fb50b7e29c6beb4fad8b.zip | |
Merge pull request #3326 from DanielFGray/master
ignore any grep aliases that might be defined
Diffstat (limited to 'plugins/svn-fast-info/svn-fast-info.plugin.zsh')
| -rw-r--r-- | plugins/svn-fast-info/svn-fast-info.plugin.zsh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh index ea19bcea0..9ea7f641d 100644 --- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh +++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh @@ -63,11 +63,11 @@ function svn_current_revision() { function svn_status_info() { local svn_status_string="$ZSH_THEME_SVN_PROMPT_CLEAN" local svn_status="$(svn status 2> /dev/null)"; - if grep -E '^\s*A' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"; fi - if grep -E '^\s*D' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}"; fi - if grep -E '^\s*M' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}"; fi - if grep -E '^\s*[R~]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}"; fi - if grep -E '^\s*\?' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}"; fi - if grep -E '^\s*[CI!L]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_DIRTY:-'!'}"; fi + if command grep -E '^\s*A' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"; fi + if command grep -E '^\s*D' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}"; fi + if command grep -E '^\s*M' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}"; fi + if command grep -E '^\s*[R~]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}"; fi + if command grep -E '^\s*\?' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}"; fi + if command grep -E '^\s*[CI!L]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_DIRTY:-'!'}"; fi echo $svn_status_string } |