From 01a9a12bbfbc21b45c59e4bbc52fbf488776d386 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 23 Sep 2009 13:46:32 -0400
Subject: auto.setup, auto-blog.setup: Fix sanitization of entered wikiname.
 Closes: #547378

---
 auto.setup | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'auto.setup')

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{}],
-- 
cgit v1.2.3


From 037d5d5296ad0073a1acbb05c4cfd6461b49d1fd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 21 Oct 2009 13:55:44 -0400
Subject: fix case

---
 auto-blog.setup | 2 +-
 auto.setup      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'auto.setup')

diff --git a/auto-blog.setup b/auto-blog.setup
index cf77b3bf7..82aa8d415 100644
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -21,7 +21,7 @@ our $rcs=IkiWiki::Setup::Automator::ask(
 our $admin=IkiWiki::Setup::Automator::ask(
 	gettext("What wiki user (or openid) will be admin?"), $ENV{USER});
 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(
diff --git a/auto.setup b/auto.setup
index dc2b19992..afb54b324 100644
--- a/auto.setup
+++ b/auto.setup
@@ -20,7 +20,7 @@ our $rcs=IkiWiki::Setup::Automator::ask(
 our $admin=IkiWiki::Setup::Automator::ask(
 	gettext("Which user (wiki account or openid) will be admin?"), $ENV{USER});
 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(
-- 
cgit v1.2.3