aboutsummaryrefslogtreecommitdiff
path: root/auto.setup
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-09-23 13:46:32 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-09-23 13:46:32 -0400
commit01a9a12bbfbc21b45c59e4bbc52fbf488776d386 (patch)
tree555250ed683d39520ea1dd4f9d3515c48f1826c1 /auto.setup
parent82ad4f57d67fa6a210436621dcb72404a099da8a (diff)
downloadikiwiki-01a9a12bbfbc21b45c59e4bbc52fbf488776d386.tar
ikiwiki-01a9a12bbfbc21b45c59e4bbc52fbf488776d386.tar.gz
auto.setup, auto-blog.setup: Fix sanitization of entered wikiname. Closes: #547378
Diffstat (limited to 'auto.setup')
-rw-r--r--auto.setup15
1 files changed, 8 insertions, 7 deletions
diff --git a/auto.setup b/auto.setup
index b3d2513d9..dc2b19992 100644
--- a/auto.setup
+++ b/auto.setup
@@ -14,6 +14,7 @@ require IkiWiki::Setup::Automator;
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(
@@ -26,13 +27,13 @@ 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{}],