Merge branch 'master' into dependency-types

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

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 742d67666ba980d556bfc1b91128f77848b2c672..d1594d7ea4b09d034ef1d8e65d88996cf65e5042 100644 (file)
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -24,15 +24,20 @@ sub prettydir ($) {
        return $dir;
 }
 
-sub import (@) {
-       my $this=shift;
-       IkiWiki::Setup::merge({@_});
+sub sanitize_wikiname ($) {
+       my $wikiname=shift;
 
        # Sanitize this to avoid problimatic directory names.
-       $config{wikiname}=~s/[^-A-Za-z0-9_]//g;
-       if (! length $config{wikiname}) {
+       $wikiname=~s/[^-A-Za-z0-9_]//g;
+       if (! length $wikiname) {
                error gettext("you must enter a wikiname (that contains alphanumerics)");
        }
+       return $wikiname;
+}
+
+sub import (@) {
+       my $this=shift;
+       IkiWiki::Setup::merge({@_});
 
        # Avoid overwriting any existing files.
        foreach my $key (qw{srcdir destdir repository dumpsetup}) {