]> 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:

bootstrap: rename url to src for consistency with documentation
authorLorenzo Cappelletti <lorenzo.cappelletti@gmail.com>
Fri, 25 Apr 2014 12:56:52 +0000 (14:56 +0200)
committerLorenzo Cappelletti <lorenzo.cappelletti@gmail.com>
Fri, 25 Apr 2014 13:14:49 +0000 (15:14 +0200)
mr

diff --git a/mr b/mr
index b60673622449fa45a097fa0e99a37b742b4cfd6c..be2bac623a79e8b9e944bb0f7c516711b180a48a 100755 (executable)
--- a/mr
+++ b/mr
@@ -1240,7 +1240,7 @@ my %loaded;
 sub loadconfig {
        my $f=shift;
        my $dir=shift;
 sub loadconfig {
        my $f=shift;
        my $dir=shift;
-       my $bootstrap_url=shift;
+       my $bootstrap_src=shift;
 
        my @toload;
 
 
        my @toload;
 
@@ -1328,8 +1328,8 @@ sub loadconfig {
        my $trusterror = sub {
                my $msg=shift;
        
        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";
                }
                                "(To trust this url, --trust-all can be used; but please use caution;\n".
                                "this can allow arbitrary code execution!)\n";
                }
@@ -1689,10 +1689,10 @@ sub bootstrap {
        eval q{use File::Copy};
        die $@ if $@;
 
        eval q{use File::Copy};
        die $@ if $@;
 
-       my $url=shift @ARGV;
+       my $src=shift @ARGV;
        my $dir=shift @ARGV || ".";
        
        my $dir=shift @ARGV || ".";
        
-       if (! defined $url || ! length $url) {
+       if (! defined $src || ! length $src) {
                die "mr: bootstrap requires source\n";
        }
 
                die "mr: bootstrap requires source\n";
        }
 
@@ -1700,26 +1700,26 @@ sub bootstrap {
        eval q{use File::Temp};
        die $@ if $@;
        my $tmpconfig=File::Temp->new();
        eval q{use File::Temp};
        die $@ if $@;
        my $tmpconfig=File::Temp->new();
-       if ($url =~ m!^[\w\d]+://!) {
+       if ($src =~ m!^[\w\d]+://!) {
                # Download the config file to a temporary location.
                my @downloader;
                # Download the config file to a temporary location.
                my @downloader;
-               if ($url =~ m!^ssh://(.*)!) {
+               if ($src =~ m!^ssh://(.*)!) {
                        @downloader = ("scp", $1, $tmpconfig);
                }
                else {
                        @downloader = ("scp", $1, $tmpconfig);
                }
                else {
-                       @downloader = ("curl", "-A", "mr", "-L", "-s", $url, "-o", $tmpconfig);
+                       @downloader = ("curl", "-A", "mr", "-L", "-s", $src, "-o", $tmpconfig);
                        push(@downloader, "-k") if $insecure;
                }
                my $status = system(@downloader);
                        push(@downloader, "-k") if $insecure;
                }
                my $status = system(@downloader);
-               die "mr bootstrap: invalid SSL certificate for $url (consider -k)\n"
+               die "mr bootstrap: invalid SSL certificate for $src (consider -k)\n"
                        if $downloader[0] eq 'curl' && $status >> 8 == 60;
                        if $downloader[0] eq 'curl' && $status >> 8 == 60;
-               die "mr bootstrap: download of $url failed\n" if $status != 0;
+               die "mr bootstrap: download of $src failed\n" if $status != 0;
        }
        else {
                # Config file is local.
        }
        else {
                # Config file is local.
-               die "mr bootstrap: cannot read file '$url'"
-                       unless -r $url;
-               copy($url, $tmpconfig) || die "copy: $!";
+               die "mr bootstrap: cannot read file '$src'"
+                       unless -r $src;
+               copy($src, $tmpconfig) || die "copy: $!";
        }
 
        # Sanity check on destination directory.
        }
 
        # Sanity check on destination directory.
@@ -1732,12 +1732,12 @@ sub bootstrap {
        # would normally be skipped.
        my $topdir=abs_path(".")."/";
        my @repo=($topdir, $topdir, ".");
        # 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") {
        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 {
                move($tmpconfig, ".mrconfig") || die "rename: $!";
        }
        else {
                move($tmpconfig, ".mrconfig") || die "rename: $!";