answer about the `%pagestate` of autopages.

[ikiwiki.git] / gitremotes

diff --git a/gitremotes b/gitremotes
index b144909243f702d04c95822ee6ce163e73896c54..f596c650f56f1a96b2b53ec5aeb7ad85f818b6d3 100755 (executable)
--- a/gitremotes
+++ b/gitremotes
@@ -1,12 +1,11 @@
 #!/usr/bin/perl
 # Parses list of remotes in doc/git.mdwn, configures git to use them
 #!/usr/bin/perl
 # Parses list of remotes in doc/git.mdwn, configures git to use them

-# all, and fetches updates from them.
-
-my $error=0;
+# all. After running this, use "git remote update --prune" to pull
+# updates from all remotes.

 
 open (IN, "doc/git.mdwn") || die "doc/git.mdwn: $!";
 while (<IN>) {
 
 open (IN, "doc/git.mdwn") || die "doc/git.mdwn: $!";
 while (<IN>) {

-       if (/^\*\s+\[\[(\w+)\]\]\s+<([^>]+)>/) {
+       if (/^\*\s+\[?\[?(\w+)(?:\|\w+)?\]?\]?\s+`([^>]+)`/) {

                # note that the remote name has to be a simple word (\w)
                # for security/sanity reasons
                my $remote=$1;
                # note that the remote name has to be a simple word (\w)
                # for security/sanity reasons
                my $remote=$1;


@@ -17,13 +16,8 @@ while (<IN>) {
                my ($oldurl)=$info=~/URL: (.*)/m;
                if ($oldurl ne $url) {
                        system("git remote rm $remote 2>/dev/null");
                my ($oldurl)=$info=~/URL: (.*)/m;
                if ($oldurl ne $url) {
                        system("git remote rm $remote 2>/dev/null");

-                       $error |= system("git", "remote", "add", "-f", $remote, $url);
-               }
-               else {
-                       $error |= system("git", "fetch", $remote);
+                       system("git", "remote", "add", "-f", $remote, $url)

                }
        }
 }
 close IN;
                }
        }
 }
 close IN;

-
-exit $error;