X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/2f80d6c39305c42561d5c3a564cbe48d191ccd5c..8c7de1139db31314694cc5218a1cf93337f16ac2:/mr

diff --git a/mr b/mr
index 8de26f8..1a57570 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
@@ -383,7 +389,7 @@ due to being offline. You can delete or edit this file to remove commands,
 or even to add other commands for 'mr online' to run. If the file is
 present, mr assumes it is in offline mode.
 
-=head "UNTRUSTED MRCONFIG FILES"
+=head1 "UNTRUSTED MRCONFIG FILES"
 
 Since mrconfig files can contain arbitrary shell commands, they can do
 anything. This flexability is good, but it also allows a malicious mrconfig
@@ -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,16 +714,16 @@ sub record {
 
 	if ($ret == OK) {
 		push @ok, $dir;
-		print "\n";
+		print "\n" unless $quiet;
 	}
 	elsif ($ret == FAILED) {
 		if ($interactive) {
 			chdir($dir) unless $no_chdir;
 			print STDERR "mr: Starting interactive shell. Exit shell to continue.\n";
-			system((getpwuid($<))[8]);
+			system((getpwuid($<))[8], "-i");
 		}
 		push @failed, $dir;
-		print "\n";
+		print "\n" unless $quiet;
 	}
 	elsif ($ret == SKIPPED) {
 		push @skipped, $dir;
@@ -780,6 +787,15 @@ sub repolist {
 	} @list;
 }
 
+sub repodir {
+	my $repo=shift;
+	my $topdir=$repo->{topdir};
+	my $subdir=$repo->{subdir};
+	my $ret=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
+	$ret=~s/\/\.$//;
+	return $ret;
+}
+
 # figure out which repos to act on
 sub selectrepos {
 	my @repos;
@@ -788,7 +804,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 +824,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 +1017,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 +1122,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 +1359,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,14 +1379,22 @@ 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 {
-		rename($tmpconfig, ".mrconfig") || die "rename: $!";
-	}
-
-	exec("mr $ENV{MR_SWITCHES} -c .mrconfig checkout");
-	die "failed to run mr checkout";
+		eval q{use File::Copy};
+		die $@ if $@;
+		move($tmpconfig, ".mrconfig") || die "rename: $!";
+	}
+
+	# 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
@@ -1409,6 +1442,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,
@@ -1449,28 +1483,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.
@@ -1629,14 +1667,26 @@ hg_trusted_checkout = hg clone $url $repo
 darcs_trusted_checkout = darcs get $url $repo
 git_bare_trusted_checkout = git clone --bare $url $repo
 
+
 help =
+ 	case `uname -s` in
+		SunOS)
+		SHOWMANFILE="man -f"
+		;;
+		Darwin)
+		SHOWMANFILE="man"
+		;;
+		*)
+		SHOWMANFILE="man -l"
+		;;
+	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"
-	man -l "$tmp" || error "man failed"
+	$SHOWMANFILE "$tmp" || error "man failed"
 list = true
 config = 
 bootstrap =