urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

put monotone dir name munging code in auto.setup 

conceptually cleaner to do it this way
master
Joey Hess 2008-08-22 21:19:53 -04:00
parent ae45223b31
commit 577477e1ce
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auto.setup
View File

@ -28,7 +28,7 @@ IkiWiki::Setup::Automator->import(
rcs => $rcs, rcs => $rcs,
srcdir => "$ENV{HOME}/$wikiname", srcdir => "$ENV{HOME}/$wikiname",
destdir => "$ENV{HOME}/public_html/$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", dumpsetup => "$ENV{HOME}/$wikiname.setup",
url => "http://$domain/~$ENV{USER}/$wikiname", url => "http://$domain/~$ENV{USER}/$wikiname",
cgiurl => "http://$domain/~$ENV{USER}/$wikiname/ikiwiki.cgi", cgiurl => "http://$domain/~$ENV{USER}/$wikiname/ikiwiki.cgi",

2
ikiwiki-makerepo
View File

@ -94,8 +94,6 @@ monotone)
fi fi
mkdir -p "$(dirname "$repository")" 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" mtn db init -d "$repository"
cleaned_srcdir=$(basename "$srcdir" | tr -s "[:space:]" "_" | sed 's/_$//g') cleaned_srcdir=$(basename "$srcdir" | tr -s "[:space:]" "_" | sed 's/_$//g')