Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / ikiwiki-transition

diff --git a/ikiwiki-transition b/ikiwiki-transition
index 3e2c89bf9d0166d2a1b29d56541b4b8c272d75d7..e42a5137c72f4ef403aeda4e117944e575928d6d 100755 (executable)
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -51,11 +51,11 @@ sub prefix_directives {
 }
 
 sub indexdb {
-       $config{wikistatedir}=shift()."/.ikiwiki";
-
-       if (! defined $config{wikistatedir}) {
+       my $dir=shift;
+       if (! defined $dir) {
                usage();                
        }
+       $config{wikistatedir}=$dir."/.ikiwiki";
 
        # Note: No lockwiki here because ikiwiki already locks it
        # before calling this.  
@@ -74,12 +74,12 @@ sub indexdb {
 }
 
 sub hashpassword {
-       $config{wikistatedir}=shift()."/.ikiwiki";
-
-       if (! defined $config{wikistatedir}) {
+       my $dir=shift;
+       if (! defined $dir) {
                usage();                
        }
-       
+       $config{wikistatedir}=$dir."/.ikiwiki";
+
        eval q{use IkiWiki::UserInfo};
        eval q{use Authen::Passphrase::BlowfishCrypt};
        if ($@) {
@@ -100,10 +100,16 @@ sub hashpassword {
 }
 
 sub aggregateinternal {
+       my $setup=shift;
+       if (! defined $setup) {
+               usage();
+       }
+
        require IkiWiki::Setup;
        require IkiWiki::Plugin::aggregate;
 
-       %config = (IkiWiki::defaultconfig(), IkiWiki::Setup::load(shift));
+       %config = IkiWiki::defaultconfig();
+       IkiWiki::Setup::load();
        IkiWiki::checkconfig();
 
        IkiWiki::Plugin::aggregate::migrate_to_internal();
@@ -111,13 +117,58 @@ sub aggregateinternal {
        print "... now add aggregateinternal => 1 to your .setup file\n";
 }
 
+sub setupformat {
+       my $setup=shift;
+       if (! defined $setup) {
+               usage();
+       }
+
+       require IkiWiki::Setup;
+
+       %config = IkiWiki::defaultconfig();
+       IkiWiki::Setup::load($setup);
+       IkiWiki::checkconfig();
+       
+       # unpack old-format wrappers setting into new fields
+       my $cgi_seen=0;
+       my $rcs_seen=0;
+       foreach my $wrapper (@{$config{wrappers}}) {
+               if ($wrapper->{cgi}) {
+                       if ($cgi_seen) {
+                               die "don't know what to do with second cgi wrapper ".$wrapper->{wrapper}."\n";
+                       }
+                       $cgi_seen++;
+                       print "setting cgi_wrapper to ".$wrapper->{wrapper}."\n";
+                       $config{cgi_wrapper}=$wrapper->{wrapper};
+                       $config{cgi_wrappermode}=$wrapper->{wrappermode}
+                               if exists $wrapper->{wrappermode};
+               }
+               elsif ($config{rcs}) {
+                       if ($rcs_seen) {
+                               die "don't know what to do with second rcs wrapper ".$wrapper->{wrapper}."\n";
+                       }
+                       $rcs_seen++;
+                       print "setting $config{rcs}_wrapper to ".$wrapper->{wrapper}."\n";
+                       $config{$config{rcs}."_wrapper"}=$wrapper->{wrapper};
+                       $config{$config{rcs}."_wrappermode"}=$wrapper->{wrappermode}
+                               if exists $wrapper->{wrappermode};
+               }
+               else {
+                       die "don't know what to do with wrapper ".$wrapper->{wrapper}."\n";
+               }
+       }
+
+       IkiWiki::Setup::dump($setup);
+}
+
 sub usage {
        print STDERR "Usage: ikiwiki-transition type ...\n";
        print STDERR "Currently supported transition subcommands:\n";
-       print STDERR "  prefix_directives file\n";
-       print STDERR "  indexdb srcdir\n";
-       print STDERR "  hashpassword srcdir\n";
-       print STDERR "  aggregateinternal setupfile\n";
+       print STDERR "\tprefix_directives file\n";
+       print STDERR "\tindexdb srcdir\n";
+       print STDERR "\thashpassword srcdir\n";
+       print STDERR "\taggregateinternal setupfile\n";
+       print STDERR "\tsetupformat setupfile\n";
        exit 1;
 }
 
@@ -136,6 +187,9 @@ elsif ($mode eq 'indexdb') {
 elsif ($mode eq 'aggregateinternal') {
        aggregateinternal(@ARGV);
 }
+elsif ($mode eq 'setupformat') {
+       setupformat(@ARGV);
+}
 else {
        usage();
 }