Removed redundant "configure'

[git.ikiwiki.info.git] / auto.setup

diff --git a/auto.setup b/auto.setup
index 9cf5e7725ede534f1d5e16c1d7f06a8064156ed0..afb54b3241895db1315da23567ad242096ac85ea 100644 (file)
--- a/auto.setup
+++ b/auto.setup
@@ -14,25 +14,26 @@ require IkiWiki::Setup::Automator;
 
 our $wikiname=IkiWiki::Setup::Automator::ask(
        gettext("What will the wiki be named?"), gettext("wiki"));
 
 our $wikiname=IkiWiki::Setup::Automator::ask(
        gettext("What will the wiki be named?"), gettext("wiki"));

+our $wikiname_short=IkiWiki::Setup::Automator::sanitize_wikiname($wikiname);

 our $rcs=IkiWiki::Setup::Automator::ask(
        gettext("What revision control system to use?"), "git");
 our $admin=IkiWiki::Setup::Automator::ask(
 our $rcs=IkiWiki::Setup::Automator::ask(
        gettext("What revision control system to use?"), "git");
 our $admin=IkiWiki::Setup::Automator::ask(

-       gettext("What wiki user (or openid) will be wiki admin?"), $ENV{USER});
+       gettext("Which user (wiki account or openid) will be admin?"), $ENV{USER});

 use Net::Domain q{hostfqdn};
 use Net::Domain q{hostfqdn};

-our $domain=hostfqdn() || ikiwiki::setup::automator::ask(
+our $domain=hostfqdn() || IkiWiki::Setup::Automator::ask(

        gettext("What is the domain name of the web server?"), "");
 
 IkiWiki::Setup::Automator->import(
        wikiname => $wikiname,
        adminuser => [$admin],
        rcs => $rcs,
        gettext("What is the domain name of the web server?"), "");
 
 IkiWiki::Setup::Automator->import(
        wikiname => $wikiname,
        adminuser => [$admin],
        rcs => $rcs,

-       srcdir => "$ENV{HOME}/$wikiname",
-       destdir => "$ENV{HOME}/public_html/$wikiname",
-       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",
-       cgi_wrapper => "$ENV{HOME}/public_html/$wikiname/ikiwiki.cgi",
+       srcdir => "$ENV{HOME}/$wikiname_short",
+       destdir => "$ENV{HOME}/public_html/$wikiname_short",
+       repository => "$ENV{HOME}/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs),
+       dumpsetup => "$ENV{HOME}/$wikiname_short.setup",
+       url => "http://$domain/~$ENV{USER}/$wikiname_short",
+       cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi",
+       cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi",

        adminemail => "$ENV{USER}\@$domain",
        add_plugins => [qw{goodstuff websetup}],
        disable_plugins => [qw{}],
        adminemail => "$ENV{USER}\@$domain",
        add_plugins => [qw{goodstuff websetup}],
        disable_plugins => [qw{}],


@@ -40,5 +41,4 @@ IkiWiki::Setup::Automator->import(
        rss => 1,
        atom => 1,
        syslog => 1,
        rss => 1,
        atom => 1,
        syslog => 1,

-       hardlink => 1,

 )
 )