Add force_overwrite setting to make setup automator overwrite existing files/directories.

[ikiwiki.git] / IkiWiki / Setup / Automator.pm

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index d1594d7ea4b09d034ef1d8e65d88996cf65e5042..79a610e20e1d50905e0a76e73bf13b080d3c7c3e 100644 (file)
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -15,6 +15,7 @@ sub ask ($$) {
        my ($question, $default)=@_;
 
        my $r=Term::ReadLine->new("ikiwiki");
+       $r->ornaments("md,me");
        $r->readline(encode_utf8($question)." ", $default);
 }
 
@@ -39,17 +40,19 @@ sub import (@) {
        my $this=shift;
        IkiWiki::Setup::merge({@_});
 
-       # Avoid overwriting any existing files.
-       foreach my $key (qw{srcdir destdir repository dumpsetup}) {
-               next unless exists $config{$key};
-               my $add="";
-               my $dir=IkiWiki::dirname($config{$key})."/";
-               my $base=IkiWiki::basename($config{$key});
-               while (-e $dir.$add.$base) {
-                       $add=1 if ! $add;
-                       $add++;
+       if (! $config{force_overwrite}) {
+               # Avoid overwriting any existing files.
+               foreach my $key (qw{srcdir destdir repository dumpsetup}) {
+                       next unless exists $config{$key};
+                       my $add="";
+                       my $dir=IkiWiki::dirname($config{$key})."/";
+                       my $base=IkiWiki::basename($config{$key});
+                       while (-e $dir.$add.$base) {
+                               $add=1 if ! $add;
+                               $add++;
+                       }
+                       $config{$key}=$dir.$add.$base;
                }
-               $config{$key}=$dir.$add.$base;
        }
        
        # Set up wrapper
@@ -72,6 +75,9 @@ sub import (@) {
                elsif ($config{rcs} eq 'mercurial') {
                        # TODO
                }
+               elsif ($config{rcs} eq 'cvs') {
+                       $config{cvs_wrapper}=$config{repository}."/CVSROOT/post-commit";
+               }
                else {
                        error sprintf(gettext("unsupported revision control system %s"),
                                $config{rcs});