From 85dc25765beeab338682ae73ab364c8b6fabb998 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 14 May 2012 16:37:38 +0200 Subject: [PATCH] find the repo dir properly --- misc/tools/conflict-rss.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/misc/tools/conflict-rss.sh b/misc/tools/conflict-rss.sh index fb10ebd6..9efabb7c 100755 --- a/misc/tools/conflict-rss.sh +++ b/misc/tools/conflict-rss.sh @@ -86,14 +86,14 @@ if [ -z "$outdir" ]; then set -- fi -case "$repodir" in - '') - repo=`git config remote.origin.url | cut -d / -f 4-` - ;; - *) - repo=$repodir # FIXME - ;; -esac +repo=$( + ( + if [ -n "$repodir" ]; then + cd "$repodir" + fi + git config remote.origin.url | cut -d / -f 4- + ) +) case "$action" in --init) -- 2.39.2