From: Rudolf Polzer Date: Mon, 14 May 2012 14:38:50 +0000 (+0200) Subject: more fixes X-Git-Tag: xonotic-v0.7.0~55^2~12 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0f8aa1f7a4663754c9121fa319df640a97137224;p=xonotic%2Fxonotic.git more fixes --- diff --git a/misc/tools/conflict-rss.sh b/misc/tools/conflict-rss.sh index 9efabb7c..73f0162e 100755 --- a/misc/tools/conflict-rss.sh +++ b/misc/tools/conflict-rss.sh @@ -50,7 +50,7 @@ EOF cat >>"$outfilename" < $branch$repo ($hash) - http://git.xonotic.org/?p=xonotic/netradiant.git;a=shortlog;h=refs/heads/$name/$branch + http://git.xonotic.org/?p=$repo;a=shortlog;h=refs/heads/$name/$branch http://de.git.xonotic.org/conflicts/$filename#$hash-$masterhash /,$d' "$1" - cat <"$1" + cat <>"$1" $datetime EOF } @@ -124,7 +124,7 @@ case "$action" in fi branches ) | while read -r HASH TYPE REFNAME; do - echo >&2 -n "$repodir $REFNAME..." + echo >&2 -n "$repo $REFNAME..." out=$( ( if [ -n "$repodir" ]; then