X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/9a651e120c51251ab679934557923114ac141ed2..c8088cf4d74fb8f48e8acf1784912727cdbc53fb:/mr?ds=sidebyside

diff --git a/mr b/mr
index d7905b6..8e845a9 100755
--- a/mr
+++ b/mr
@@ -90,6 +90,9 @@ Register an existing repository in the mrconfig file. By default, the
 repository in the current directory is registered, or you can specify a
 directory to register.
 
+By default it registers it to the ~/.mrconfig file. To make it write to a
+different file, use the -c option.
+
 =item config
 
 Adds, modifies, removes, or prints a value from the mrconfig file. The next
@@ -247,6 +250,11 @@ use strict;
 use Getopt::Long;
 use Cwd qw(getcwd abs_path);
 
+$SIG{INT}=sub {
+	print STDERR "mr: interrupted\n";
+	exit 2;
+};
+
 $ENV{MR_CONFIG}="$ENV{HOME}/.mrconfig";
 my $directory=getcwd();
 my $verbose=0;
@@ -258,7 +266,7 @@ my %alias;
 Getopt::Long::Configure("no_permute");
 my $result=GetOptions(
 	"d|directory=s" => sub { $directory=abs_path($_[1]) },
-	"c|config=s" => \$ENV{MR_CONFIG},
+	"c|config=s" => sub { $ENV{MR_CONFIG}=abs_path($_[1]) },
 	"v|verbose" => \$verbose,
 	"s|stats" => \$stats,
 );
@@ -395,10 +403,19 @@ sub action { #{{{
 			my $test="set -e;".$lib.$config{$topdir}{$subdir}{deleted};
 			print "mr $action: running deleted test >>$test<<\n" if $verbose;
 			my $ret=system($test);
-			if ($ret >> 8 == 0) {
-				print STDERR "mr error: $dir should be deleted yet still exists\n\n";
-				push @failed, $dir;
-				return;
+			if ($ret != 0) {
+				if (($? & 127) == 2) {
+					print STDERR "mr $action: interrupted\n";
+					exit 2;
+				}
+				elsif ($? & 127) {
+					print STDERR "mr $action: deleted test received signal ".($? & 127)."\n";
+				}
+				if ($ret >> 8 == 0) {
+					print STDERR "mr error: $dir should be deleted yet still exists\n\n";
+					push @failed, $dir;
+					return;
+				}
 			}
 		}
 	}
@@ -409,7 +426,13 @@ sub action { #{{{
 			push @skipped, $dir;
 			return;
 		}
+
 		$dir=~s/^(.*)\/[^\/]+\/?$/$1/;
+
+		if (! -d $dir) {
+			print "mr $action: creating parent directory $dir\n" if $verbose;
+			my $ret=system("mkdir", "-p", $dir);
+		}
 	}
 	elsif ($action eq 'update') {
 		if (! -d $dir) {
@@ -424,10 +447,20 @@ sub action { #{{{
 			"my_action(){ $config{$topdir}{$subdir}{skip}\n }; my_action '$action'";
 		print "mr $action: running skip test >>$test<<\n" if $verbose;
 		my $ret=system($test);
-		if ($ret >> 8 == 0) {
-			print "mr $action: $dir skipped per config file\n" if $verbose;
-			push @skipped, $dir;
-			return;
+		if ($ret != 0) {
+			if (($? & 127) == 2) {
+				print STDERR "mr $action: interrupted\n";
+				exit 2;
+			}
+			elsif ($? & 127) {
+				print STDERR "mr $action: skip test received signal ".($? & 127)."\n";
+				exit 1;
+			}
+			if ($ret >> 8 == 0) {
+				print "mr $action: $dir skipped per config file\n" if $verbose;
+				push @skipped, $dir;
+				return;
+			}
 		}
 	}
 	
@@ -452,6 +485,13 @@ sub action { #{{{
 		print STDERR "mr $action: running >>$command<<\n" if $verbose;
 		my $ret=system($command);
 		if ($ret != 0) {
+			if (($? & 127) == 2) {
+				print STDERR "mr $action: interrupted\n";
+				exit 2;
+			}
+			elsif ($? & 127) {
+				print STDERR "mr $action: received signal ".($? & 127)."\n";
+			}
 			print STDERR "mr $action: failed ($ret)\n" if $verbose;
 			push @failed, $dir;
 			if ($ret >> 8 != 0) {
@@ -598,9 +638,20 @@ sub loadconfig { #{{{
 				$knownactions{$parameter}=1;
 				if ($parameter eq 'chain' &&
 				    length $dir && $section ne "DEFAULT" &&
-				    -e $dir.$section."/.mrconfig" &&
-			    	    system($value) >> 8 == 0) {
-					push @toload, $dir.$section."/.mrconfig";
+				    -e $dir.$section."/.mrconfig") {
+					my $ret=system($value);
+					if ($ret != 0) {
+						if (($? & 127) == 2) {
+							print STDERR "mr $action: chain test interrupted\n";
+							exit 2;
+						}
+						elsif ($? & 127) {
+							print STDERR "mr $action: chain test received signal ".($? & 127)."\n";
+						}
+					}
+					else {
+						push @toload, $dir.$section."/.mrconfig";
+					}
 			        }
 			}
 		}