X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/e2d8848e4a55926790a1626f046f76b5777b4ada..85ecfb40a19334d7ea53de8b982915eff3cae07d:/mr?ds=sidebyside

diff --git a/mr b/mr
index 8d6d1dd..b5d5c11 100755
--- a/mr
+++ b/mr
@@ -219,6 +219,12 @@ Be verbose.
 
 Be quiet.
 
+=item -k
+
+=item --insecure
+
+Accept untrusted SSL certificates when bootstrapping.
+
 =item -s
 
 =item --stats
@@ -433,6 +439,7 @@ my $config_overridden=0;
 my $verbose=0;
 my $quiet=0;
 my $stats=0;
+my $insecure=0;
 my $interactive=0;
 my $max_depth;
 my $no_chdir=0;
@@ -707,7 +714,7 @@ sub record {
 
 	if ($ret == OK) {
 		push @ok, $dir;
-		print "\n";
+		print "\n" unless $quiet;
 	}
 	elsif ($ret == FAILED) {
 		if ($interactive) {
@@ -716,7 +723,7 @@ sub record {
 			system((getpwuid($<))[8], "-i");
 		}
 		push @failed, $dir;
-		print "\n";
+		print "\n" unless $quiet;
 	}
 	elsif ($ret == SKIPPED) {
 		push @skipped, $dir;
@@ -780,6 +787,13 @@ sub repolist {
 	} @list;
 }
 
+sub repodir {
+	my $repo=shift;
+	my $topdir=$repo->{topdir};
+	my $subdir=$repo->{subdir};
+	return abs_path(($subdir =~/^\//) ? $subdir : $topdir.$subdir);
+}
+
 # figure out which repos to act on
 sub selectrepos {
 	my @repos;
@@ -788,7 +802,7 @@ sub selectrepos {
 		my $subdir=$repo->{subdir};
 
 		next if $subdir eq 'DEFAULT';
-		my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
+		my $dir=repodir($repo);
 		my $d=$directory;
 		$dir.="/" unless $dir=~/\/$/;
 		$d.="/" unless $d=~/\/$/;
@@ -808,7 +822,7 @@ sub selectrepos {
 			my $subdir=$repo->{subdir};
 			
 			next if $subdir eq 'DEFAULT';
-			my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
+			my $dir=repodir($repo);
 			my $d=$directory;
 			$dir.="/" unless $dir=~/\/$/;
 			$d.="/" unless $d=~/\/$/;
@@ -1001,7 +1015,7 @@ sub loadconfig {
 		open($in, "<", $f) || die "mr: open $f: $!\n";
 	}
 	my @lines=<$in>;
-	close $in;
+	close $in unless ref $f eq 'GLOB';
 
 	my $section;
 	my $line=0;
@@ -1106,6 +1120,13 @@ sub loadconfig {
 	}
 }
 
+sub startingconfig {
+	%alias=%config=%configfiles=%knownactions=%loaded=();
+	my $datapos=tell(DATA);
+	loadconfig(\*DATA);
+	seek(DATA,$datapos,0); # rewind
+}
+
 sub modifyconfig {
 	my $f=shift;
 	# the section to modify or add
@@ -1336,9 +1357,11 @@ sub bootstrap {
 	eval q{use File::Temp};
 	die $@ if $@;
 	my $tmpconfig=File::Temp->new();
-	if (system("curl", "-A", "mr", "-s", $url, "-o", $tmpconfig) != 0) {
-		die "mr: download of $url failed\n";
-	}
+	my @curlargs = ("curl", "-A", "mr", "-s", $url, "-o", $tmpconfig);
+	push(@curlargs, "-k") if $insecure;
+	my $curlstatus = system(@curlargs);
+	die "mr bootstrap: invalid SSL certificate for $url (consider -k)\n" if $curlstatus >> 8 == 60;
+	die "mr bootstrap: download of $url failed\n" if $curlstatus != 0;
 
 	if (! -e $dir) {
 		system("mkdir", "-p", $dir);
@@ -1354,7 +1377,7 @@ sub bootstrap {
 		if exists $config{$topdir}{"."}{"checkout"};
 
 	if (-e ".mrconfig") {
-		print STDERR "mr: .mrconfig file already exists, not overwriting with $url\n";
+		print STDERR "mr bootstrap: .mrconfig file already exists, not overwriting with $url\n";
 	}
 	else {
 		eval q{use File::Copy};
@@ -1362,8 +1385,14 @@ sub bootstrap {
 		move($tmpconfig, ".mrconfig") || die "rename: $!";
 	}
 
-	exec("mr $ENV{MR_SWITCHES} -c .mrconfig checkout");
-	die "failed to run mr checkout";
+	# Reload the config file (in case we got a different version)
+	# and checkout everything else.
+	startingconfig();
+	loadconfig(".mrconfig");
+	dispatch("checkout");
+	@skipped=grep { abs_path($_) ne abs_path($topdir) } @skipped;
+	showstats("bootstrap");
+	exitstats();
 }
 
 # alias expansion and command stemming
@@ -1411,6 +1440,7 @@ sub getopts {
 		"v|verbose" => \$verbose,
 		"q|quiet" => \$quiet,
 		"s|stats" => \$stats,
+		"k|insecure" => \$insecure,
 		"i|interactive" => \$interactive,
 		"n|no-recurse:i" => \$max_depth,
 		"j|jobs:i" => \$jobs,
@@ -1451,28 +1481,32 @@ sub init {
 		$ENV{MR_PATH}=$Bin."/".$Script;
 	};
 }
+	
+sub exitstats {
+	if (@failed) {
+		exit 1;
+	}
+	elsif (! @ok && @skipped) {
+		exit 1;
+	}
+	else {
+		exit 0;
+	}
+}
 
 sub main {
 	getopts();
 	init();
 
-	loadconfig(\*DATA);
+	startingconfig();
 	loadconfig($ENV{MR_CONFIG});
 	#use Data::Dumper; print Dumper(\%config);
 	
 	my $action=expandaction(shift @ARGV);
 	dispatch($action);
-	showstats($action);
 
-	if (@failed) {
-		exit 1;
-	}
-	elsif (! @ok && @skipped) {
-		exit 1;
-	}
-	else {
-		exit 0;
-	}
+	showstats($action);
+	exitstats();
 }
 
 # Finally, some useful actions that mr knows about by default.