X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/900fe2548852e975ce41e04bfd5ef155c44821f0..052ba0de1db046987852e41b14c2fc78ebd905f2:/mr diff --git a/mr b/mr index d48fd61..ee5e5e2 100755 --- a/mr +++ b/mr @@ -149,7 +149,7 @@ loadconfig($config); #use Data::Dumper; #print Dumper(\%config); -my (@failures, @successes, @skipped); +my (@failed, @successful, @skipped); my $first=1; foreach my $topdir (sort keys %config) { foreach my $subdir (sort keys %{$config{$topdir}}) { @@ -213,7 +213,7 @@ sub action { my $ret=system($command); if ($ret != 0) { print STDERR "mr $action: failed to run: $command\n" if $verbose; - push @failures, $topdir.$subdir; + push @failed, $topdir.$subdir; if ($ret >> 8 != 0) { print STDERR "mr $action: command failed\n"; } @@ -222,7 +222,7 @@ sub action { } } else { - push @successes, $dir; + push @successful, $dir; } } } @@ -237,11 +237,11 @@ sub showstat { return; } print "\nmr $action: finished (".join("; ", - showstat($#successes+1, "success", "successes"), - showstat($#failures+1, "failure", "failures"), + showstat($#successful+1, "successful", "successful"), + showstat($#failed+1, "failed", "failed"), showstat($#skipped+1, "skipped", "skipped"), ).")\n"; -exit @failures ? 1 : 0; +exit @failed ? 1 : 0; my %loaded; sub loadconfig { @@ -334,7 +334,7 @@ update = \ elif [ -d .git ]; then \ git pull origin master; \ else \ - echo "mr update: unknown RCS"; \ + echo "mr update: unknown repo type"; \ exit 1; \ fi status = \ @@ -343,15 +343,15 @@ status = \ elif [ -d .git ]; then \ git status || true; \ else \ - echo "mr status: unknown RCS"; \ + echo "mr status: unknown repo type"; \ exit 1; \ fi commit = \ if [ -d .svn ]; then \ svn commit "$@"; \ elif [ -d .git ]; then \ - git commit -a "$@"; \ + git commit -a "$@" && git push --all; \ else \ - echo "mr commit: unknown RCS"; \ + echo "mr commit: unknown repo type"; \ exit 1; \ fi