]> git.madduck.net Git - code/myrepos.git/blobdiff - mr

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

releasing version 0.44
[code/myrepos.git] / mr
diff --git a/mr b/mr
index 0a78df5704d926994e04b072abedd770586c987c..a431e8ac82ac989fdbfe1e5b1231e449d8508682 100755 (executable)
--- 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