Re-work shell in terms of spawn.

Since there's really not much difference, and no reason to make a distinction at the VM op level that is so easily replicated at the Perl 6 level.
rakudo · Jun 12, 2017 · 40dd369 · 40dd369
1 parent 3da8025
commit 40dd369
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/core/Proc.pm b/src/core/Proc.pm
@@ -92,21 +92,21 @@ my class Proc {
     method spawn(*@args where .so, :$cwd = $*CWD, :$env) {
         @!command = @args;
         my %env := $env ?? $env.hash !! %*ENV;
-        self.status(nqp::p6box_i(nqp::spawn(
-            CLONE-LIST-DECONTAINERIZED(@args),
-            nqp::unbox_s($cwd.Str),
-            CLONE-HASH-DECONTAINERIZED(%env),
-            $!in_fh, $!out_fh, $!err_fh,
-            $!flags
-        )));
-        self.Bool
+        self!spawn-internal(@args, $cwd, %env)
     }
 
     method shell($cmd, :$cwd = $*CWD, :$env) {
         @!command = $cmd;
         my %env := $env ?? $env.hash !! %*ENV;
-        self.status(nqp::p6box_i(nqp::shell(
-            nqp::unbox_s($cmd),
+        my @args := Rakudo::Internals.IS-WIN
+            ?? (%*ENV<ComSpec>, '/c', $cmd)
+            !! ('/bin/sh', '-c', $cmd);
+        self!spawn-internal(@args, $cwd, %env)
+    }
+
+    method !spawn-internal(@args, $cwd, %env) {
+        self.status(nqp::p6box_i(nqp::spawn(
+            CLONE-LIST-DECONTAINERIZED(@args),
             nqp::unbox_s($cwd.Str),
             CLONE-HASH-DECONTAINERIZED(%env),
             $!in_fh, $!out_fh, $!err_fh,