Merge pull request #411 from dicobaja/patch/which-php
use `where` command for windows host
This commit is contained in:
commit
655e0494d3
@ -146,7 +146,8 @@ switch ($action) {
|
|||||||
$r = ORM::for_table('tbl_routers')->find_many();
|
$r = ORM::for_table('tbl_routers')->find_many();
|
||||||
$ui->assign('r', $r);
|
$ui->assign('r', $r);
|
||||||
if (function_exists("shell_exec")) {
|
if (function_exists("shell_exec")) {
|
||||||
$php = trim(shell_exec('which php'));
|
$which = stripos(php_uname('s'), "Win") === 0 ? 'where' : 'which';
|
||||||
|
$php = trim(shell_exec("$which php"));
|
||||||
if (empty($php)) {
|
if (empty($php)) {
|
||||||
$php = 'php';
|
$php = 'php';
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user