X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/041923a89ece8b1ed195cb7b528843c15770ea6f..3316f9cc737c091ff79270f75fc30dd349616b12:/IkiWiki/Setup/Automator.pm diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm index ee83a2fcf..9f2380d52 100644 --- a/IkiWiki/Setup/Automator.pm +++ b/IkiWiki/Setup/Automator.pm @@ -10,38 +10,63 @@ use IkiWiki::UserInfo; use Term::ReadLine; use File::Path; -sub ask ($$) { #{{{ +sub ask ($$) { my ($question, $default)=@_; my $r=Term::ReadLine->new("ikiwiki"); $r->readline($question." ", $default); -} #}}} +} -sub prettydir ($) { #{{{ +sub prettydir ($) { my $dir=shift; $dir=~s/^\Q$ENV{HOME}\E\//~\//; return $dir; -} #}}} +} -sub import (@) { #{{{ +sub import (@) { my $this=shift; IkiWiki::Setup::merge({@_}); # Sanitize this to avoid problimatic directory names. - $config{wikiname}=~s/[^-A-Za-z0-9_] //g; + $config{wikiname}=~s/[^-A-Za-z0-9_]//g; if (! length $config{wikiname}) { - die "you must enter a wikiname\n"; + error gettext("you must enter a wikiname (that contains alphanumerics)"); } # Avoid overwriting any existing files. foreach my $key (qw{srcdir destdir repository dumpsetup}) { next unless exists $config{$key}; my $add=""; - while (-e $add.$config{$key}) { + my $dir=IkiWiki::dirname($config{$key})."/"; + my $base=IkiWiki::basename($config{$key}); + while (-e $dir.$add.$base) { $add=1 if ! $add; $add++; } - $config{$key}=$add.$config{$key}; + $config{$key}=$dir.$add.$base; + } + + # Set up wrapper + if ($config{rcs}) { + if ($config{rcs} eq 'git') { + $config{git_wrapper}=$config{repository}."/hooks/post-update"; + } + elsif ($config{rcs} eq 'svn') { + $config{svn_wrapper}=$config{repository}."/hooks/post-commit"; + } + elsif ($config{rcs} eq 'monotone') { + $config{mtn_wrapper}=$config{srcdir}."_MTN/ikiwiki-netsync-hook"; + } + elsif ($config{rcs} eq 'bzr') { + # TODO + } + elsif ($config{rcs} eq 'mercurial') { + # TODO + } + else { + error sprintf(gettext("unsupported revision control system %s"), + $config{rcs}); + } } IkiWiki::checkconfig(); @@ -55,26 +80,12 @@ sub import (@) { #{{{ my @params=($config{rcs}, $config{srcdir}); push @params, $config{repository} if exists $config{repository}; if (system("ikiwiki-makerepo", @params) != 0) { - die "failed: ikiwiki-makerepo @params"; + error gettext("failed to set up the repository with ikiwiki-makerepo"); } } # Generate setup file. require IkiWiki::Setup; - if ($config{rcs}) { - if ($config{rcs} eq 'git') { - $config{git_wrapper}=$config{repository}."/hooks/post-update"; - } - elsif ($config{rcs} eq 'svn') { - $config{svn_wrapper}=$config{repository}."/hooks/post-commit"; - } - elsif ($config{rcs} eq 'bzr') { - # TODO - } - elsif ($config{rcs} eq 'mercurial') { - # TODO - } - } IkiWiki::Setup::dump($config{dumpsetup}); # Build the wiki, but w/o wrappers, so it's not live yet. @@ -131,6 +142,6 @@ sub import (@) { #{{{ print "To modify settings, edit ".prettydir($config{dumpsetup})." and then run:\n"; print " ikiwiki -setup ".prettydir($config{dumpsetup})."\n"; exit 0; -} #}}} +} 1