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

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 0a78df5704d926994e04b072abedd770586c987c..98c96feb707865eed0aa56185b214f7f94a7738b 100755 (executable)
--- a/mr
+++ b/mr
@@ -1357,7 +1357,8 @@ sub bootstrap {
                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");
@@ -1633,13 +1634,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