From 596cef84c75261398fe66f713d97d5ca96130146 Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Thu, 16 Dec 2021 10:07:35 +0100 Subject: style(svn-fast-info): fix code style and `svn info` locale --- plugins/svn-fast-info/svn-fast-info.plugin.zsh | 34 +++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'plugins/svn-fast-info') diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh index f40a59685..f2f449f79 100644 --- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh +++ b/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 } -- cgit v1.2.3-70-g09d2 From ef3a85cd42c671217a0bcb58685484a5a5a0ada4 Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Thu, 16 Dec 2021 10:08:25 +0100 Subject: fix(svn-fast-info): URL-decode svn branch name --- plugins/svn-fast-info/svn-fast-info.plugin.zsh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'plugins/svn-fast-info') diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh index f2f449f79..05f0ac67d 100644 --- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh +++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh @@ -36,7 +36,9 @@ function svn_repo_need_upgrade() { } function svn_current_branch_name() { - grep '^URL:' <<< "${1:-$(svn info 2> /dev/null)}" | egrep -o '(tags|branches)/[^/]+|trunk' + omz_urldecode "$( + command grep '^URL:' <<< "${1:-$(svn info 2>/dev/null)}" | command grep -Eo '(tags|branches)/[^/]+|trunk' + )" } function svn_repo_root_name() { -- cgit v1.2.3-70-g09d2 From 75ed59b7c09e3bb2d04a5d35065bdd9277e9947f Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Thu, 16 Dec 2021 10:09:05 +0100 Subject: fix(svn-fast-info): quote % characters in svn branch name --- plugins/svn-fast-info/svn-fast-info.plugin.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/svn-fast-info') diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh index 05f0ac67d..46dd5cb0c 100644 --- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh +++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh @@ -20,7 +20,7 @@ function svn_prompt_info() { "$ZSH_PROMPT_BASE_COLOR" \ \ "$ZSH_THEME_BRANCH_NAME_COLOR" \ - "$(svn_current_branch_name $info)" \ + "${$(svn_current_branch_name $info):gs/%/%%}" \ "$ZSH_PROMPT_BASE_COLOR" \ \ "$(svn_current_revision $info)" \ -- cgit v1.2.3-70-g09d2