mingzailao
/
ohmyzsh
mirror of https://github.com/ohmyzsh/ohmyzsh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pull/10569/head
Marc Cornellà 2021-12-16 10:07:35 +01:00
parent 63345c4e5d
commit 596cef84c7
No known key found for this signature in database
GPG Key ID: 0314585E776A9C1B
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/svn-fast-info/svn-fast-info.plugin.zsh
View File

@ -1,6 +1,6 @@
function svn_prompt_info() { function svn_prompt_info() {
local 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) local repo_need_upgrade=$(svn_repo_need_upgrade $info)
if [[ -n $repo_need_upgrade ]]; then if [[ -n $repo_need_upgrade ]]; then
@ -31,7 +31,7 @@ function svn_prompt_info() {
} }
function svn_repo_need_upgrade() { 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" echo "E155036: upgrade repo with svn upgrade"
} }
@ -40,33 +40,33 @@ function svn_current_branch_name() {
} }
function svn_repo_root_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() { 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() { function svn_status_info() {
local svn_status_string="$ZSH_THEME_SVN_PROMPT_CLEAN" local svn_status_string="$ZSH_THEME_SVN_PROMPT_CLEAN"
local svn_status="$(svn status 2> /dev/null)"; local svn_status="$(svn status 2>/dev/null)";
if command grep -E '^\s*A' &> /dev/null <<< $svn_status; then if command grep -E '^\s*A' &>/dev/null <<< "$svn_status"; then
svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}" svn_status_string+="${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"
fi fi
if command grep -E '^\s*D' &> /dev/null <<< $svn_status; then if command grep -E '^\s*D' &>/dev/null <<< "$svn_status"; then
svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}" svn_status_string+="${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}"
fi fi
if command grep -E '^\s*M' &> /dev/null <<< $svn_status; then if command grep -E '^\s*M' &>/dev/null <<< "$svn_status"; then
svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}" svn_status_string+="${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}"
fi fi
if command grep -E '^\s*[R~]' &> /dev/null <<< $svn_status; then if command grep -E '^\s*[R~]' &>/dev/null <<< "$svn_status"; then
svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}" svn_status_string+="${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}"
fi fi
if command grep -E '^\s*\?' &> /dev/null <<< $svn_status; then if command grep -E '^\s*\?' &>/dev/null <<< "$svn_status"; then
svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}" svn_status_string+="${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}"
fi fi
if command grep -E '^\s*[CI!L]' &> /dev/null <<< $svn_status; then if command grep -E '^\s*[CI!L]' &>/dev/null <<< "$svn_status"; then
svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_DIRTY:-!}" svn_status_string+="${ZSH_THEME_SVN_PROMPT_DIRTY:-!}"
fi fi
echo $svn_status_string echo $svn_status_string
} }