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 /themes | |
| 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 'themes')
| -rw-r--r-- | themes/agnoster.zsh-theme | 4 | ||||
| -rw-r--r-- | themes/bureau.zsh-theme | 2 | ||||
| -rw-r--r-- | themes/mortalscumbag.zsh-theme | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme index 7a62bd860..8c7be6e01 100644 --- a/themes/agnoster.zsh-theme +++ b/themes/agnoster.zsh-theme @@ -123,10 +123,10 @@ prompt_hg() { st="" rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g') branch=$(hg id -b 2>/dev/null) - if `hg st | grep -Eq "^\?"`; then + if `hg st | grep -q "^\?"`; then prompt_segment red black st='±' - elif `hg st | grep -Eq "^(M|A)"`; then + elif `hg st | grep -q "^(M|A)"`; then prompt_segment yellow black st='±' else diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme index 443d1d5ee..148abec10 100644 --- a/themes/bureau.zsh-theme +++ b/themes/bureau.zsh-theme @@ -31,7 +31,7 @@ bureau_git_status () { if $(echo "$_INDEX" | grep '^.[MTD] ' &> /dev/null); then _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED" fi - if $(echo "$_INDEX" | grep -E '^\?\? ' &> /dev/null); then + if $(echo "$_INDEX" | command grep -E '^\?\? ' &> /dev/null); then _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED" fi if $(echo "$_INDEX" | grep '^UU ' &> /dev/null); then diff --git a/themes/mortalscumbag.zsh-theme b/themes/mortalscumbag.zsh-theme index 5dbf2e4f6..ccce4197a 100644 --- a/themes/mortalscumbag.zsh-theme +++ b/themes/mortalscumbag.zsh-theme @@ -10,12 +10,12 @@ function my_git_prompt() { fi # is anything staged? - if $(echo "$INDEX" | grep -E -e '^(D[ M]|[MARC][ MD]) ' &> /dev/null); then + if $(echo "$INDEX" | command grep -E -e '^(D[ M]|[MARC][ MD]) ' &> /dev/null); then STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED" fi # is anything unstaged? - if $(echo "$INDEX" | grep -E -e '^[ MARC][MD] ' &> /dev/null); then + if $(echo "$INDEX" | command grep -E -e '^[ MARC][MD] ' &> /dev/null); then STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED" fi @@ -25,7 +25,7 @@ function my_git_prompt() { fi # is anything unmerged? - if $(echo "$INDEX" | grep -E -e '^(A[AU]|D[DU]|U[ADU]) ' &> /dev/null); then + if $(echo "$INDEX" | command grep -E -e '^(A[AU]|D[DU]|U[ADU]) ' &> /dev/null); then STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED" fi |