]> git.madduck.net Git - code/myrepos.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merge branch 'local_bootstrap' of https://github.com/lorcap/myrepos
authorJoey Hess <joey@kitenet.net>
Wed, 28 May 2014 21:32:57 +0000 (17:32 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 28 May 2014 21:32:57 +0000 (17:32 -0400)
1  2 
mr

diff --combined mr
index e807778a86035a8a7cda669be26ac5b89936d555,dba54cc63142a63e1a497db380f67e82bb3565b4..a7295f0d252799156b6d43b951a42056f8a245df
--- 1/mr
--- 2/mr
+++ b/mr
@@@ -28,7 -28,7 +28,7 @@@ B<mr> [options] grep patter
  
  B<mr> [options] run command [param ...]
  
- B<mr> [options] bootstrap url [directory]
+ B<mr> [options] bootstrap src [directory]
  
  B<mr> [options] register [repository]
  
@@@ -130,17 -130,39 +130,39 @@@ These commands are also available
  
  =over 4
  
- =item bootstrap url [directory]
+ =item bootstrap src [directory]
  
- Causes mr to download the url, and use it as a .mrconfig file to checkout
- the repositories listed in it, into the specified directory.
+ Causes mr to retrieve the source C<src> and use it as a .mrconfig file to
checkout the repositories listed in it, into the specified directory.
  
- To use scp to download, the url may have the form ssh://[user@]host:file
+ B<mr> understands several types of sources:
+ =over 4
+ =item URL for curl
+ C<src> may be an URL understood by B<curl>.
+ =item copy via ssh
+ To use B<scp> to download, the C<src> may have the form
+ C<ssh://[user@]host:file>.
+ =item local file
+ You can retrieve the config file by other means and pass its B<path> as C<src>.
+ =item standard input
+ If source C<src> consists in a single dash C<->, config file is read from
+ standard input.
+ =back
  
  The directory will be created if it does not exist. If no directory is
  specified, the current directory will be used.
  
If the .mrconfig file includes a repository named ".", that
As a special case, if source C<src> includes a repository named ".", that
  is checked out into the top of the specified directory.
  
  =item list (or ls)
@@@ -1223,7 -1245,7 +1245,7 @@@ my %loaded
  sub loadconfig {
        my $f=shift;
        my $dir=shift;
-       my $bootstrap_url=shift;
+       my $bootstrap_src=shift;
  
        my @toload;
  
        my $trusterror = sub {
                my $msg=shift;
        
-               if (defined $bootstrap_url) {
-                       die "mr: $msg in untrusted $bootstrap_url line $lineno\n".
+               if (defined $bootstrap_src) {
+                       die "mr: $msg in untrusted $bootstrap_src line $lineno\n".
                                "(To trust this url, --trust-all can be used; but please use caution;\n".
                                "this can allow arbitrary code execution!)\n";
                }
@@@ -1551,7 -1573,10 +1573,7 @@@ sub dispatch 
        my $action=shift;
  
        # actions that do not operate on all repos
 -      if ($action eq 'help') {
 -              help(@ARGV);
 -      }
 -      elsif ($action eq 'config') {
 +      if ($action eq 'config') {
                config(@ARGV);
        }
        elsif ($action eq 'register') {
  }
  
  sub help {
 -      exec($config{''}{DEFAULT}{help}) || die "exec: $!";
 +      my $help=q#
 +              case `uname -s` in
 +                      SunOS)
 +                      SHOWMANFILE="man -f"
 +                      ;;
 +                      Darwin)
 +                      SHOWMANFILE="man"
 +                      ;;
 +                      *)
 +                      SHOWMANFILE="man"
 +                      ;;
 +              esac
 +              if [ ! -e "$MR_PATH" ]; then
 +                      error "cannot find program path"
 +              fi
 +              tmp=$(mktemp -t mr.XXXXXXXXXX) || error "mktemp failed"
 +              trap "rm -f $tmp" exit
 +              pod2man -c mr "$MR_PATH" > "$tmp" || error "pod2man failed"
 +              $SHOWMANFILE "$tmp" || error "man failed"
 +      #;
 +      exec($help) || die "exec: $!";
  }
  
  sub config {
@@@ -1686,30 -1691,47 +1708,47 @@@ sub register 
  }
  
  sub bootstrap {
-       my $url=shift @ARGV;
+       eval q{use File::Copy};
+       die $@ if $@;
+       my $src=shift @ARGV;
        my $dir=shift @ARGV || ".";
        
-       if (! defined $url || ! length $url) {
-               die "mr: bootstrap requires url\n";
+       if (! defined $src || ! length $src) {
+               die "mr: bootstrap requires source\n";
        }
-       
-       # Download the config file to a temporary location.
+       # Retrieve config file.
        eval q{use File::Temp};
        die $@ if $@;
        my $tmpconfig=File::Temp->new();
-       my @downloader;
-       if ($url =~ m!^ssh://(.*)!) {
-               @downloader = ("scp", $1, $tmpconfig);
+       if ($src =~ m!^[\w\d]+://!) {
+               # Download the config file to a temporary location.
+               my @downloader;
+               if ($src =~ m!^ssh://(.*)!) {
+                       @downloader = ("scp", $1, $tmpconfig);
+               }
+               else {
+                       @downloader = ("curl", "-A", "mr", "-L", "-s", $src, "-o", $tmpconfig);
+                       push(@downloader, "-k") if $insecure;
+               }
+               my $status = system(@downloader);
+               die "mr bootstrap: invalid SSL certificate for $src (consider -k)\n"
+                       if $downloader[0] eq 'curl' && $status >> 8 == 60;
+               die "mr bootstrap: download of $src failed\n" if $status != 0;
+       }
+       elsif ($src eq '-') {
+               # Config file is read from stdin.
+               copy(\*STDIN, $tmpconfig) || die "stdin: $!";
        }
        else {
-               @downloader = ("curl", "-A", "mr", "-L", "-s", $url, "-o", $tmpconfig);
-               push(@downloader, "-k") if $insecure;
+               # Config file is local.
+               die "mr bootstrap: cannot read file '$src'"
+                       unless -r $src;
+               copy($src, $tmpconfig) || die "copy: $!";
        }
-       my $status = system(@downloader);
-       die "mr bootstrap: invalid SSL certificate for $url (consider -k)\n"
-               if $downloader[0] eq 'curl' && $status >> 8 == 60;
-       die "mr bootstrap: download of $url failed\n" if $status != 0;
  
+       # Sanity check on destination directory.
        if (! -e $dir) {
                system("mkdir", "-p", $dir);
        }
        # would normally be skipped.
        my $topdir=abs_path(".")."/";
        my @repo=($topdir, $topdir, ".");
-       loadconfig($tmpconfig, $topdir, $url);
+       loadconfig($tmpconfig, $topdir, $src);
        record(\@repo, action("checkout", @repo, 1))
                if exists $config{$topdir}{"."}{"checkout"};
  
        if (-e ".mrconfig") {
-               print STDERR "mr bootstrap: .mrconfig file already exists, not overwriting with $url\n";
+               print STDERR "mr bootstrap: .mrconfig file already exists, not overwriting with $src\n";
        }
        else {
-               eval q{use File::Copy};
-               die $@ if $@;
                move($tmpconfig, ".mrconfig") || die "rename: $!";
        }
  
@@@ -1842,7 -1862,6 +1879,7 @@@ sub exitstats 
  sub main {
        getopts();
        init();
 +      help(@ARGV) if $ARGV[0] eq 'help';
  
        startingconfig();
        loadconfig($HOME_MR_CONFIG);
@@@ -2094,12 -2113,30 +2131,12 @@@ bzr_trusted_checkout = bzr checkout|clo
  hg_trusted_checkout = hg clone $url $repo
  darcs_trusted_checkout = darcs get $url $repo
  git_bare_trusted_checkout = git clone --bare $url $repo
 -vcsh_trusted_checkout = vcsh run "$MR_REPO" git clone $url $repo
 +vcsh_old_trusted_checkout = vcsh run "$MR_REPO" git clone $url $repo
 +vcsh_trusted_checkout = vcsh clone $url $repo
  # fossil: messy to do
  veracity_trusted_checkout = vv clone $url $repo
  
  
 -help =
 -      case `uname -s` in
 -              SunOS)
 -              SHOWMANFILE="man -f"
 -              ;;
 -              Darwin)
 -              SHOWMANFILE="man"
 -              ;;
 -              *)
 -              SHOWMANFILE="man"
 -              ;;
 -      esac
 -      if [ ! -e "$MR_PATH" ]; then
 -              error "cannot find program path"
 -      fi
 -      tmp=$(mktemp -t mr.XXXXXXXXXX) || error "mktemp failed"
 -      trap "rm -f $tmp" exit
 -      pod2man -c mr "$MR_PATH" > "$tmp" || error "pod2man failed"
 -      $SHOWMANFILE "$tmp" || error "man failed"
  list = true
  config = 
  bootstrap =