Merge pull request #45 from gyohk/master

Changed '/bin/bash' to 'bash';
kohkimakimoto · Jun 26, 2015 · e89b1d1 · e89b1d1
2 parents 3501911 + 7ae35d7
commit e89b1d1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Altax/Module/Task/Process/Process.php b/src/Altax/Module/Task/Process/Process.php
@@ -128,7 +128,7 @@ protected function compileRealCommand($commandline, $options, $isLocalExecute=FA
                 $realCommand .= 'sudo -u' . $options["user"] . ' TERM=dumb ';
             }
 
-            $realCommand .= '/bin/bash -l -c "';
+            $realCommand .= 'bash -l -c "';
 
             if (isset($options["cwd"])) {
                 $realCommand .= 'cd ' . $options["cwd"] . ' && ';

diff --git a/tests/Altax/Module/Task/Process/ProcessTest.php b/tests/Altax/Module/Task/Process/ProcessTest.php
@@ -51,7 +51,7 @@ public function testRun()
         $process->run("echo helloworld", array("cwd" => "~"));
         $output = $process->getRuntimeTask()->getOutput()->fetch();
         $this->assertRegExp("/helloworld/", $output);
-        $this->assertRegExp('/Real command: \/bin\/bash -l -c "cd ~ && echo helloworld"/', $output);
+        $this->assertRegExp('/Real command: bash -l -c "cd ~ && echo helloworld"/', $output);
 
         //echo $output;
     }
@@ -72,7 +72,7 @@ public function testRunLocally1()
         if(preg_match('/Windows/i', $os)){
             $regexp = '/Real command: cmd.exe \/C "cd ' . preg_quote($homedir, '/') . ' & echo helloworld"/';
         }else {
-            $regexp = '/Real command: \/bin\/bash -l -c "cd ' . preg_quote($homedir, '/') . ' && echo helloworld"/';
+            $regexp = '/Real command: bash -l -c "cd ' . preg_quote($homedir, '/') . ' && echo helloworld"/';
         }
         $this->assertRegExp($regexp, $output);
     }
@@ -99,7 +99,7 @@ public function testRunLocally2()
                 "pwd",
             ));
             $output = $process->getRuntimeTask()->getOutput()->fetch();
-            $this->assertRegExp('/Real command: \/bin\/bash -l -c "cd \/var\/tmp && pwd"/', $output);
+            $this->assertRegExp('/Real command: bash -l -c "cd \/var\/tmp && pwd"/', $output);
         }
     }