X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/6e115274b615e698a8673ffded63895cf5089b41..deb8ddcf307273f8cbf7252e796f6769c83be427:/mr?ds=sidebyside diff --git a/mr b/mr index 0a78df5..a431e8a 100755 --- a/mr +++ b/mr @@ -1357,7 +1357,9 @@ 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}; + 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