[Bps-public-commit] SD branch, master, updated. 1aeff8d9beb33221174253fca5e11a4d9d0748a8

[sunnavy at bestpractical.com]

The branch, master has been updated
       via  1aeff8d9beb33221174253fca5e11a4d9d0748a8 (commit)
       via  121113ad0a04b919bf546c611dc14206a0562a7e (commit)
       via  ac045920008b57d06ad52a078e027da40e0d1c45 (commit)
      from  98050315fdbee52f7bdacdce2fe015dd4309142e (commit)

Summary of changes:
 lib/App/SD/CLI/Command/Browser.pm |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit ac045920008b57d06ad52a078e027da40e0d1c45
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Aug 17 19:04:07 2009 +0800

    exec("start",...) will cause "no such file or directory" error

diff --git a/lib/App/SD/CLI/Command/Browser.pm b/lib/App/SD/CLI/Command/Browser.pm
index 53f63e3..62e83c5 100644
--- a/lib/App/SD/CLI/Command/Browser.pm
+++ b/lib/App/SD/CLI/Command/Browser.pm
@@ -28,7 +28,12 @@ sub open_browser {
         if ( $child_pid == 0 ) {
             # child runs this block
             sleep 2;
-            exec($opener, $args{url}) or die "Couldn't exec $opener: $!";
+            if ( $^O eq 'MSWin32' ) {
+                system($opener, $args{url}) && die "Couldn't run $opener: $!";
+            }
+            else {
+                exec($opener, $args{url}) or die "Couldn't run $opener: $!";
+            }
             exit(0);
         }
         return;     # parent just returns to run the server

commit 121113ad0a04b919bf546c611dc14206a0562a7e
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Aug 17 19:10:51 2009 +0800

    make the decision(if print_usage or not) earlier for browser cmd

diff --git a/lib/App/SD/CLI/Command/Browser.pm b/lib/App/SD/CLI/Command/Browser.pm
index 62e83c5..ca4e5fe 100644
--- a/lib/App/SD/CLI/Command/Browser.pm
+++ b/lib/App/SD/CLI/Command/Browser.pm
@@ -5,6 +5,7 @@ extends 'App::SD::CLI::Command::Server';
 
 override run => sub {
     my $self = shift;
+    $self->print_usage if $self->has_arg('h');
     $self->server;  # make sure server is initialised to not delay later
 
     Prophet::CLI->end_pager();

commit 1aeff8d9beb33221174253fca5e11a4d9d0748a8
Merge: 121113a 9805031
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Aug 18 08:54:09 2009 +0800

    Merge branch 'master' of code.bestpractical.com:/git/sd


-----------------------------------------------------------------------