Fix drush and other commands when using local shell provider

factorial-io · Jun 28, 2019 · 1f2292c · 1f2292c
1 parent 28a04fb
commit 1f2292c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/ShellProvider/LocalShellProvider.php b/src/ShellProvider/LocalShellProvider.php
@@ -263,11 +263,12 @@ public function createTunnelProcess(HostConfig $target_config, array $prefix = [
      */
     public function wrapCommandInLoginShell(array $command)
     {
-        return [
+        array_unshift(
+            $command,
             '/bin/bash',
             '--login',
-            '-c',
-            '\'' . implode(' ', $command). '\'',
-        ];
+            '-c'
+        );
+        return $command;
     }
 }
diff --git a/src/ShellProvider/SshShellProvider.php b/src/ShellProvider/SshShellProvider.php
@@ -268,4 +268,17 @@ public function copyFileFrom(
         }
         return parent::copyFileFrom($from_shell, $source_file_name, $target_file_name, $context, $verbose);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function wrapCommandInLoginShell(array $command)
+    {
+        return [
+            '/bin/bash',
+            '--login',
+            '-c',
+            '\'' . implode(' ', $command). '\'',
+        ];
+    }
 }