local configuration error.

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

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 88e9f3d245c95a2da545b1899d0d4f2a468dbd93..42caf3039a9d79fc9686adc206b5b874eb2b3bdf 100644 (file)
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -9,21 +9,22 @@ use IkiWiki;
 use IkiWiki::UserInfo;
 use Term::ReadLine;
 use File::Path;
 use IkiWiki::UserInfo;
 use Term::ReadLine;
 use File::Path;

+use Encode;

 
 

-sub ask ($$) { #{{{
+sub ask ($$) {

        my ($question, $default)=@_;
 
        my $r=Term::ReadLine->new("ikiwiki");
        my ($question, $default)=@_;
 
        my $r=Term::ReadLine->new("ikiwiki");

-       $r->readline($question." ", $default);
-} #}}}
+       $r->readline(encode_utf8($question)." ", $default);
+}

 
 

-sub prettydir ($) { #{{{
+sub prettydir ($) {

        my $dir=shift;
        $dir=~s/^\Q$ENV{HOME}\E\//~\//;
        return $dir;
        my $dir=shift;
        $dir=~s/^\Q$ENV{HOME}\E\//~\//;
        return $dir;

-} #}}}
+}

 
 

-sub import (@) { #{{{
+sub import (@) {

        my $this=shift;
        IkiWiki::Setup::merge({@_});
 
        my $this=shift;
        IkiWiki::Setup::merge({@_});
 


@@ -73,8 +74,18 @@ sub import (@) { #{{{
 
        print "\n\nSetting up $config{wikiname} ...\n";
 
 
        print "\n\nSetting up $config{wikiname} ...\n";
 

-       # Set up the repository.
+       # Set up the srcdir.

        mkpath($config{srcdir}) || die "mkdir $config{srcdir}: $!";
        mkpath($config{srcdir}) || die "mkdir $config{srcdir}: $!";

+       # Copy in example wiki.
+       if (exists $config{example}) {
+               # cp -R is POSIX
+               # Another reason not to use -a is so that pages such as blog
+               # posts will not have old creation dates on this new wiki.
+               system("cp -R $IkiWiki::installdir/share/ikiwiki/examples/$config{example}/* $config{srcdir}");
+               delete $config{example};
+       }
+
+       # Set up the repository.

        delete $config{repository} if ! $config{rcs} || $config{rcs}=~/bzr|mercurial/;
        if ($config{rcs}) {
                my @params=($config{rcs}, $config{srcdir});
        delete $config{repository} if ! $config{rcs} || $config{rcs}=~/bzr|mercurial/;
        if ($config{rcs}) {
                my @params=($config{rcs}, $config{srcdir});


@@ -142,6 +153,6 @@ sub import (@) { #{{{
        print "To modify settings, edit ".prettydir($config{dumpsetup})." and then run:\n";
        print " ikiwiki -setup ".prettydir($config{dumpsetup})."\n";
        exit 0;
        print "To modify settings, edit ".prettydir($config{dumpsetup})." and then run:\n";
        print " ikiwiki -setup ".prettydir($config{dumpsetup})."\n";
        exit 0;

-} #}}}
+}

 
 1
 
 1