try some win32 fixes

moritz · moritz · commit 5c333a0a03e9 · 2012-06-24T12:04:50.000+02:00
diff --git a/bin/p6doc b/bin/p6doc
@@ -10,7 +10,7 @@ my class X::P6doc is Exception {
 
 constant DEBUG = %*ENV<P6DOC_DEBUG>;
 sub findbin() returns Str {
-    $*PROGRAM_NAME.subst(rx{<-[/]>+$}, '');
+    $*PROGRAM_NAME.subst(rx{<-[/\\]>+$}, '');
 }
 
 sub tempfile() {
@@ -45,10 +45,10 @@ sub locate-module(Str $modulename) {
 }
 
 sub show-docs(Str $path, :$section) {
-   my $pager = %*ENV<PAGER> // 'less';
+   my $pager = %*ENV<PAGER> //  ($*OS eq 'MSWin32 ?? 'more' !! 'less');
    if $section.defined {
        %*ENV<PERL6_POD_HEADING> = $section;
-       my $i = findbin() ~ '../lib';
+      my $i = findbin() ~ '../lib';
        say "launching 'perl6 -I$i --doc=SectionFilter $path | $pager'" if DEBUG;
        shell "perl6 -I$i --doc=SectionFilter $path | $pager";
    }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ my class X::P6doc is Exception {`
`10`	`10`
`11`	`11`	`constant DEBUG = %*ENV<P6DOC_DEBUG>;`
`12`	`12`	`sub findbin() returns Str {`
`13`		`- $*PROGRAM_NAME.subst(rx{<-[/]>+$}, '');`
	`13`	`+ $*PROGRAM_NAME.subst(rx{<-[/\\]>+$}, '');`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`sub tempfile() {`
`@@ -45,10 +45,10 @@ sub locate-module(Str $modulename) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`sub show-docs(Str $path, :$section) {`
`48`		`- my $pager = %*ENV<PAGER> // 'less';`
	`48`	`+ my $pager = %ENV<PAGER> // ($OS eq 'MSWin32 ?? 'more' !! 'less');`
`49`	`49`	`if $section.defined {`
`50`	`50`	`%*ENV<PERL6_POD_HEADING> = $section;`
`51`		`- my $i = findbin() ~ '../lib';`
	`51`	`+ my $i = findbin() ~ '../lib';`
`52`	`52`	`say "launching 'perl6 -I$i --doc=SectionFilter $path \| $pager'" if DEBUG;`
`53`	`53`	`shell "perl6 -I$i --doc=SectionFilter $path \| $pager";`
`54`	`54`	`}`