merge from my real .mrconfig, and remove some stuff

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 0a78df5704d926994e04b072abedd770586c987c..f4af3c7c016a08bf60cee4b1b158ed172d145b24 100755 (executable)
--- a/mr
+++ b/mr
@@ -383,7 +383,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
@@ -707,7 +707,7 @@ sub record {
 
        if ($ret == OK) {
                push @ok, $dir;
-               print "\n";
+               print "\n" unless $quiet;
        }
        elsif ($ret == FAILED) {
                if ($interactive) {
@@ -716,7 +716,7 @@ sub record {
                        system((getpwuid($<))[8], "-i");
                }
                push @failed, $dir;
-               print "\n";
+               print "\n" unless $quiet;
        }
        elsif ($ret == SKIPPED) {
                push @skipped, $dir;
@@ -1337,7 +1337,7 @@ sub bootstrap {
        die $@ if $@;
        my $tmpconfig=File::Temp->new();
        if (system("curl", "-A", "mr", "-s", $url, "-o", $tmpconfig) != 0) {
-               die "mr: download of $url failed\n";
+               die "mr bootstrap: download of $url failed\n";
        }
 
        if (! -e $dir) {
@@ -1354,10 +1354,12 @@ 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: $!";
+               eval q{use File::Copy};
+               die $@ if $@;
+               move($tmpconfig, ".mrconfig") || die "rename: $!";
        }
 
        exec("mr $ENV{MR_SWITCHES} -c .mrconfig checkout");
@@ -1633,13 +1635,13 @@ git_bare_trusted_checkout = git clone --bare $url $repo
 help =
        case `uname -s` in
                SunOS)
-               SHOWMANFILE="/usr/bin/man -f"
+               SHOWMANFILE="man -f"
                ;;
                Darwin)
-               SHOWMANFILE="/usr/bin/man"
+               SHOWMANFILE="man"
                ;;
                *)
-               SHOWMANFILE="/usr/bin/man -l"
+               SHOWMANFILE="man -l"
                ;;
        esac
        if [ ! -e "$MR_PATH" ]; then