Browse Source

style(svn-fast-info): fix code style and `svn info` locale

Marc Cornellà 3 years ago
parent
commit
596cef84c7
1 changed files with 17 additions and 17 deletions
  1. 17 17
      plugins/svn-fast-info/svn-fast-info.plugin.zsh

+ 17 - 17
plugins/svn-fast-info/svn-fast-info.plugin.zsh

@@ -1,6 +1,6 @@
 function svn_prompt_info() {
   local info
-  info=$(svn info 2>&1) || return 1 # capture stdout and stderr
+  info=$(LANG= svn info 2>&1) || return 1 # capture stdout and stderr
   local repo_need_upgrade=$(svn_repo_need_upgrade $info)
 
   if [[ -n $repo_need_upgrade ]]; then
@@ -31,7 +31,7 @@ function svn_prompt_info() {
 }
 
 function svn_repo_need_upgrade() {
-  grep -q "E155036" <<< "${1:-$(svn info 2> /dev/null)}" && \
+  command grep -q "E155036" <<< "${1:-$(LANG= svn info 2>/dev/null)}" && \
     echo "E155036: upgrade repo with svn upgrade"
 }
 
@@ -40,33 +40,33 @@ function svn_current_branch_name() {
 }
 
 function svn_repo_root_name() {
-  grep '^Repository\ Root:' <<< "${1:-$(svn info 2> /dev/null)}" | sed 's#.*/##'
+  command grep '^Repository\ Root:' <<< "${1:-$(LANG= svn info 2>/dev/null)}" | sed 's#.*/##'
 }
 
 function svn_current_revision() {
-  echo "${1:-$(svn info 2> /dev/null)}" | sed -n 's/Revision: //p'
+  echo "${1:-$(LANG= svn info 2>/dev/null)}" | sed -n 's/Revision: //p'
 }
 
 function svn_status_info() {
   local svn_status_string="$ZSH_THEME_SVN_PROMPT_CLEAN"
-  local svn_status="$(svn status 2> /dev/null)";
-  if command grep -E '^\s*A' &> /dev/null <<< $svn_status; then
-    svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"
+  local svn_status="$(svn status 2>/dev/null)";
+  if command grep -E '^\s*A' &>/dev/null <<< "$svn_status"; then
+    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:-✖}"
+  if command grep -E '^\s*D' &>/dev/null <<< "$svn_status"; then
+    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:-✎}"
+  if command grep -E '^\s*M' &>/dev/null <<< "$svn_status"; then
+    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:-∿}"
+  if command grep -E '^\s*[R~]' &>/dev/null <<< "$svn_status"; then
+    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:-?}"
+  if command grep -E '^\s*\?' &>/dev/null <<< "$svn_status"; then
+    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:-!}"
+  if command grep -E '^\s*[CI!L]' &>/dev/null <<< "$svn_status"; then
+    svn_status_string+="${ZSH_THEME_SVN_PROMPT_DIRTY:-!}"
   fi
   echo $svn_status_string
 }