From acf16c90c373b5ff58cd75951af7bf84c1958f60 Mon Sep 17 00:00:00 2001 From: Drarok Ithaqua Date: Mon, 23 Sep 2013 10:09:56 +0100 Subject: [PATCH] Avoid running `svn info` twice, and avoid matching the "Relative URL" line in its output. --- plugins/svn/svn.plugin.zsh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh index bf8fad616..9d59add60 100644 --- a/plugins/svn/svn.plugin.zsh +++ b/plugins/svn/svn.plugin.zsh @@ -24,8 +24,9 @@ function in_svn() { function svn_get_repo_name() { if in_svn; then - svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT - svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" + SVN_INFO=$(svn info) + echo $SVN_INFO | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT + echo $SVN_INFO | sed -n "s/^URL:\ .*$SVN_ROOT\///p" fi } @@ -43,7 +44,7 @@ function svn_get_branch_name() { } \ }' ) - + if [ "x$_DISPLAY" = "x" ]; then svn_get_repo_name else