mirror of
https://gitlab.com/xonotic/xonotic
synced 2025-02-02 03:31:48 +00:00
url fixes
This commit is contained in:
parent
fdfb4b32c6
commit
0a4fb1f7fe
@ -39,9 +39,9 @@ to_rss()
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
|
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
|
||||||
<channel>
|
<channel>
|
||||||
<title>Merge conflicts for $name</title>
|
<title>XonCW: $name</title>
|
||||||
<link>http://git.xonotic.org/</link>
|
<link>http://git.xonotic.org/</link>
|
||||||
<description>...</description>
|
<description>Xonotic Conflict Watch for branches by $name</description>
|
||||||
<ttl>3600</ttl>
|
<ttl>3600</ttl>
|
||||||
<atom:link href="http://de.git.xonotic.org/conflicts/$filename" rel="self" type="application/rss+xml" />
|
<atom:link href="http://de.git.xonotic.org/conflicts/$filename" rel="self" type="application/rss+xml" />
|
||||||
<lastBuildDate>$datetime</lastBuildDate>
|
<lastBuildDate>$datetime</lastBuildDate>
|
||||||
@ -86,6 +86,15 @@ if [ -z "$outdir" ]; then
|
|||||||
set --
|
set --
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
case "$repodir" in
|
||||||
|
'')
|
||||||
|
repo=`git config remote.origin.url | cut -d / -f 4-`
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
repo=$repodir # FIXME
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
case "$action" in
|
case "$action" in
|
||||||
--init)
|
--init)
|
||||||
mkdir -p "$outdir"
|
mkdir -p "$outdir"
|
||||||
@ -141,7 +150,7 @@ case "$action" in
|
|||||||
n=divVerent
|
n=divVerent
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
echo "$out" | to_rss "$outdir" "$n" "$masterhash" "$HASH" "$b" "$repodir"
|
echo "$out" | to_rss "$outdir" "$n" "$masterhash" "$HASH" "$b" "$repo"
|
||||||
echo >&2 " CONFLICT"
|
echo >&2 " CONFLICT"
|
||||||
else
|
else
|
||||||
echo >&2 " ok"
|
echo >&2 " ok"
|
||||||
|
Loading…
Reference in New Issue
Block a user