X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/ba5e0ca2eca4d80aefc362d4aabd531d3ed4c0d0..2e4e7de3c48c2e557a6e306507ed2fcd80b60d9b:/mr?ds=inline

diff --git a/mr b/mr
index a897a5f..fd380db 100755
--- a/mr
+++ b/mr
@@ -20,6 +20,8 @@ B<mr> [options] diff
 
 B<mr> [options] log
 
+B<mr> [options] bootstrap url
+
 B<mr> [options] register [repository]
 
 B<mr> [options] config section ["parameter=[value]" ...]
@@ -98,6 +100,14 @@ These commands are also available:
 
 =over 4
 
+=item bootstrap url
+
+Causes mr to download the url, save it to a .mrconfig file in the
+current directory, and then check out all repositories listed in it.
+
+(Please only do this if you have reason to trust the url, since
+mrconfig files can contain arbitrary commands!)
+
 =item list (or ls)
 
 List the repositories that mr will act on.
@@ -179,6 +189,11 @@ the current working directory.
 
 Use the specified mrconfig file. The default is B<~/.mrconfig>
 
+=item -p
+
+Search in the current directory, and its parent directories and use
+the first B<.mrconfig> found, instead of the default B<~/.mrconfig>.
+
 =item -v
 
 Be verbose.
@@ -349,7 +364,7 @@ the documentation in the files for details about using them.
 
 =head1 AUTHOR
 
-Copyright 2007 Joey Hess <joey@kitenet.net>
+Copyright 2007-2009 Joey Hess <joey@kitenet.net>
 
 Licensed under the GNU GPL version 2 or higher.
 
@@ -1018,6 +1033,9 @@ sub dispatch {
 	elsif ($action eq 'register') {
 		register(@ARGV);
 	}
+	elsif ($action eq 'bootstrap') {
+		bootstrap();
+	}
 	elsif ($action eq 'remember' ||
 	       $action eq 'offline' ||
 	       $action eq 'online') {
@@ -1123,6 +1141,25 @@ sub register {
 	exec($command) || die "exec: $!";
 }
 
+sub bootstrap {
+	my $url=shift @ARGV;
+
+	if (! defined $url || ! length $url) {
+		die "mr: bootstrap requires url\n";
+	}
+
+	if (-e ".mrconfig") {
+		die "mr: .mrconfig file already exists, not overwriting with $url\n";
+	}
+
+	if (system("curl", "-s", $url, "-o", ".mrconfig") != 0) {
+		die "mr: download of $url failed\n";
+	}
+
+	exec("mr $ENV{MR_SWITCHES} -c .mrconfig checkout");
+	die "failed to run mr checkout";
+}
+
 # alias expansion and command stemming
 sub expandaction {
 	my $action=shift;
@@ -1147,12 +1184,24 @@ sub expandaction {
 	return $action;
 }
 
+sub find_nearest_mrconfig {
+	my $dir=getcwd();
+	while (length $dir) {
+		if (-e "$dir/.mrconfig") {
+			return "$dir/.mrconfig";
+		}
+		$dir=~s/\/[^\/]*$//;
+	}
+	die "no .mrconfig found in path\n";
+}
+
 sub getopts {
 	my @saved=@ARGV;
 	Getopt::Long::Configure("bundling", "no_permute");
 	my $result=GetOptions(
 		"d|directory=s" => sub { $directory=abs_path($_[1]) },
 		"c|config=s" => sub { $ENV{MR_CONFIG}=$_[1]; $config_overridden=1 },
+		"p|path" => sub { $ENV{MR_CONFIG}=find_nearest_mrconfig(); $config_overridden=1 },
 		"v|verbose" => \$verbose,
 		"q|quiet" => \$quiet,
 		"s|stats" => \$stats,
@@ -1376,6 +1425,7 @@ help =
 	man -l "$tmp" || error "man failed"
 list = true
 config = 
+bootstrap = 
 
 online =
 	if [ -s ~/.mrlog ]; then