mr bootstrap: Fix cross-device rename failure. Closes: #557962

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 8de26f832aaaba70d8a6085ebdcd6a8b96211e8d..98c96feb707865eed0aa56185b214f7f94a7738b 100755 (executable)
--- a/mr
+++ b/mr
@@ -713,7 +713,7 @@ sub record {
                if ($interactive) {
                        chdir($dir) unless $no_chdir;
                        print STDERR "mr: Starting interactive shell. Exit shell to continue.\n";
                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";
                }
                push @failed, $dir;
                print "\n";


@@ -1357,7 +1357,8 @@ sub bootstrap {
                print STDERR "mr: .mrconfig file already exists, not overwriting with $url\n";
        }
        else {
                print STDERR "mr: .mrconfig file already exists, not overwriting with $url\n";
        }
        else {

-               rename($tmpconfig, ".mrconfig") || die "rename: $!";
+               eval q{use File::Copy};
+               move($tmpconfig, ".mrconfig") || die "rename: $!";

        }
 
        exec("mr $ENV{MR_SWITCHES} -c .mrconfig checkout");
        }
 
        exec("mr $ENV{MR_SWITCHES} -c .mrconfig checkout");


@@ -1629,14 +1630,26 @@ hg_trusted_checkout = hg clone $url $repo
 darcs_trusted_checkout = darcs get $url $repo
 git_bare_trusted_checkout = git clone --bare $url $repo
 
 darcs_trusted_checkout = darcs get $url $repo
 git_bare_trusted_checkout = git clone --bare $url $repo
 

+

 help =
 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"
        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 = 
 list = true
 config = 
 bootstrap =