From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 14 May 2012 14:37:38 +0000 (+0200)
Subject: find the repo dir properly
X-Git-Tag: xonotic-v0.7.0~55^2~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=85dc25765beeab338682ae73ab364c8b6fabb998;p=xonotic%2Fxonotic.git

find the repo dir properly
---

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)