596cef84c75261398fe66f713d97d5ca96130146
- Author
- Marc Cornellà <hello@mcornella.com>
- Committer
- Marc Cornellà <hello@mcornella.com>
- Date
Message
style(svn-fast-info): fix code style and `svn info` locale
Diff
1diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
2index f40a59685f493b925043d8fd94d177f74a1516cc..f2f449f79cd33a9beaa469809274b17654c7d60b 100644
3--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
4+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
5@@ -1,6 +1,6 @@
6 function svn_prompt_info() {
7 local info
8- info=$(svn info 2>&1) || return 1 # capture stdout and stderr
9+ info=$(LANG= svn info 2>&1) || return 1 # capture stdout and stderr
10 local repo_need_upgrade=$(svn_repo_need_upgrade $info)
11
12 if [[ -n $repo_need_upgrade ]]; then
13@@ -31,7 +31,7 @@ function svn_prompt_info() {
14 }
15
16 function svn_repo_need_upgrade() {
17- grep -q "E155036" <<< "${1:-$(svn info 2> /dev/null)}" && \
18+ command grep -q "E155036" <<< "${1:-$(LANG= svn info 2>/dev/null)}" && \
19 echo "E155036: upgrade repo with svn upgrade"
20 }
21
22@@ -40,33 +40,33 @@ function svn_current_branch_name() {
23 }
24
25 function svn_repo_root_name() {
26- grep '^Repository\ Root:' <<< "${1:-$(svn info 2> /dev/null)}" | sed 's#.*/##'
27+ command grep '^Repository\ Root:' <<< "${1:-$(LANG= svn info 2>/dev/null)}" | sed 's#.*/##'
28 }
29
30 function svn_current_revision() {
31- echo "${1:-$(svn info 2> /dev/null)}" | sed -n 's/Revision: //p'
32+ echo "${1:-$(LANG= svn info 2>/dev/null)}" | sed -n 's/Revision: //p'
33 }
34
35 function svn_status_info() {
36 local svn_status_string="$ZSH_THEME_SVN_PROMPT_CLEAN"
37- local svn_status="$(svn status 2> /dev/null)";
38- if command grep -E '^\s*A' &> /dev/null <<< $svn_status; then
39- svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"
40+ local svn_status="$(svn status 2>/dev/null)";
41+ if command grep -E '^\s*A' &>/dev/null <<< "$svn_status"; then
42+ svn_status_string+="${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"
43 fi
44- if command grep -E '^\s*D' &> /dev/null <<< $svn_status; then
45- svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}"
46+ if command grep -E '^\s*D' &>/dev/null <<< "$svn_status"; then
47+ svn_status_string+="${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}"
48 fi
49- if command grep -E '^\s*M' &> /dev/null <<< $svn_status; then
50- svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}"
51+ if command grep -E '^\s*M' &>/dev/null <<< "$svn_status"; then
52+ svn_status_string+="${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}"
53 fi
54- if command grep -E '^\s*[R~]' &> /dev/null <<< $svn_status; then
55- svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}"
56+ if command grep -E '^\s*[R~]' &>/dev/null <<< "$svn_status"; then
57+ svn_status_string+="${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}"
58 fi
59- if command grep -E '^\s*\?' &> /dev/null <<< $svn_status; then
60- svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}"
61+ if command grep -E '^\s*\?' &>/dev/null <<< "$svn_status"; then
62+ svn_status_string+="${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}"
63 fi
64- if command grep -E '^\s*[CI!L]' &> /dev/null <<< $svn_status; then
65- svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_DIRTY:-!}"
66+ if command grep -E '^\s*[CI!L]' &>/dev/null <<< "$svn_status"; then
67+ svn_status_string+="${ZSH_THEME_SVN_PROMPT_DIRTY:-!}"
68 fi
69 echo $svn_status_string
70 }