X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/7993c3fea43f94925a6a4e0a1f3f5731aeb80fdb..a54b03f753aa67f09bc1c64b7dd2ae7d77858da0:/mr diff --git a/mr b/mr index 0a78df5..98c96fe 100755 --- 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