]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
put monotone dir name munging code in auto.setup
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 23 Aug 2008 01:19:53 +0000 (21:19 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 23 Aug 2008 01:19:53 +0000 (21:19 -0400)
conceptually cleaner to do it this way

auto.setup
ikiwiki-makerepo

index 74879dbc51047fb66db08027cf02e9f8a2c1d737..ef0f1723c9e48be1937ab9e1886a6074c405b15d 100644 (file)
@@ -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",
index ef627449894a8dd6e756a682d102b82fabe5fe1b..c3d835c308436a5a50d158420ba827c80b95e8af 100755 (executable)
@@ -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')