From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 23 Aug 2008 01:19:53 +0000 (-0400)
Subject: put monotone dir name munging code in auto.setup
X-Git-Tag: 2.62~72
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/577477e1ce94d6a9626a0db3ba700c0d971c704c

put monotone dir name munging code in auto.setup

conceptually cleaner to do it this way
---

diff --git a/auto.setup b/auto.setup
index 74879dbc5..ef0f1723c 100644
--- a/auto.setup
+++ b/auto.setup
@@ -28,7 +28,7 @@ IkiWiki::Setup::Automator->import(
 	rcs => $rcs,
 	srcdir => "$ENV{HOME}/$wikiname",
 	destdir => "$ENV{HOME}/public_html/$wikiname",
-	repository => "$ENV{HOME}/$wikiname.$rcs",
+	repository => "$ENV{HOME}/$wikiname.".($rcs eq "monotone" ? "mtn" : $rcs),
 	dumpsetup => "$ENV{HOME}/$wikiname.setup",
 	url => "http://$domain/~$ENV{USER}/$wikiname",
 	cgiurl => "http://$domain/~$ENV{USER}/$wikiname/ikiwiki.cgi",
diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index ef6274498..c3d835c30 100755
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -94,8 +94,6 @@ monotone)
 	fi
 
 	mkdir -p "$(dirname "$repository")"
-	# fix the repository suffix we get from auto.setup
-	repository="$(echo "$repository" | sed 's/.monotone/.mtn/g')"
 	mtn db init -d "$repository"
 
 	cleaned_srcdir=$(basename "$srcdir" | tr -s "[:space:]" "_" | sed 's/_$//g')