]> git.madduck.net Git - code/myrepos.git/commitdiff

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:

Fix help page display on Solaris and OS X
authorGeoff Davis <gadavis@ucsd.edu>
Mon, 2 Nov 2009 20:26:20 +0000 (12:26 -0800)
committerGeoff Davis <gadavis@ucsd.edu>
Mon, 2 Nov 2009 20:26:20 +0000 (12:26 -0800)
mr assumed that we were using Linux/GNU man. Added logic to detect SunOS
and Darwin, and call man with the appropriate arguments

mr

diff --git a/mr b/mr
index eb766d45b657975d857ae12a8c07aa895b18fe27..0a78df5704d926994e04b072abedd770586c987c 100755 (executable)
--- a/mr
+++ b/mr
@@ -1629,14 +1629,26 @@ hg_trusted_checkout = hg clone $url $repo
 darcs_trusted_checkout = darcs get $url $repo
 git_bare_trusted_checkout = git clone --bare $url $repo
 
+
 help =
+       case `uname -s` in
+               SunOS)
+               SHOWMANFILE="/usr/bin/man -f"
+               ;;
+               Darwin)
+               SHOWMANFILE="/usr/bin/man"
+               ;;
+               *)
+               SHOWMANFILE="/usr/bin/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"
-       man -l "$tmp" || error "man failed"
+       $SHOWMANFILE "$tmp" || error "man failed"
 list = true
 config = 
 bootstrap =