From 577477e1ce94d6a9626a0db3ba700c0d971c704c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 22 Aug 2008 21:19:53 -0400 Subject: [PATCH] put monotone dir name munging code in auto.setup conceptually cleaner to do it this way --- auto.setup | 2 +- ikiwiki-makerepo | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) 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') -- 2.32.0.93.g670b81a890