]> git.madduck.net Git - code/myrepos.git/blobdiff - mr

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:

bootstrap: add support to local files
[code/myrepos.git] / mr
diff --git a/mr b/mr
index ddc07388e17084b6ecf334d1ef97df38bb8e6fc0..8601aeb422df35262239d308b18e6189b8037e6c 100755 (executable)
--- a/mr
+++ b/mr
@@ -1669,30 +1669,43 @@ sub register {
 }
 
 sub bootstrap {
+       eval q{use File::Copy};
+       die $@ if $@;
+
        my $url=shift @ARGV;
        my $dir=shift @ARGV || ".";
        
        if (! defined $url || ! length $url) {
                die "mr: bootstrap requires url\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 ($url =~ m!^[\w\d]+://!) {
+               # Download the config file to a temporary location.
+               my @downloader;
+               if ($url =~ m!^ssh://(.*)!) {
+                       @downloader = ("scp", $1, $tmpconfig);
+               }
+               else {
+                       @downloader = ("curl", "-A", "mr", "-L", "-s", $url, "-o", $tmpconfig);
+                       push(@downloader, "-k") if $insecure;
+               }
+               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;
        }
        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 '$url'"
+                       unless -r $url;
+               copy($url, $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);
        }
@@ -1710,8 +1723,6 @@ sub bootstrap {
                print STDERR "mr bootstrap: .mrconfig file already exists, not overwriting with $url\n";
        }
        else {
-               eval q{use File::Copy};
-               die $@ if $@;
                move($tmpconfig, ".mrconfig") || die "rename: $!";
        }