Fix help page display on Solaris and OS X

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 8de26f832aaaba70d8a6085ebdcd6a8b96211e8d..0a78df5704d926994e04b072abedd770586c987c 100755 (executable)
--- a/mr
+++ b/mr
@@ -713,7 +713,7 @@ sub record {
                if ($interactive) {
                        chdir($dir) unless $no_chdir;
                        print STDERR "mr: Starting interactive shell. Exit shell to continue.\n";
                if ($interactive) {
                        chdir($dir) unless $no_chdir;
                        print STDERR "mr: Starting interactive shell. Exit shell to continue.\n";

-                       system((getpwuid($<))[8]);
+                       system((getpwuid($<))[8], "-i");

                }
                push @failed, $dir;
                print "\n";
                }
                push @failed, $dir;
                print "\n";


@@ -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
 
 darcs_trusted_checkout = darcs get $url $repo
 git_bare_trusted_checkout = git clone --bare $url $repo
 

+

 help =
 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"
        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 = 
 list = true
 config = 
 bootstrap =