mirror of
https://github.com/moodle/moodle.git
synced 2025-04-20 07:56:06 +02:00
MDL-34885 phpunit: better cygwin detection.
For some reason, on my computer, $_SERVER['SHELL'] was not set, so I changed the test to also consider $_SERVER['TERM']. This now works for me.
This commit is contained in:
parent
87e9331d93
commit
6d3b1e1f9d
@ -150,8 +150,16 @@ function phpunit_boostrap_fix_file_permissions($file) {
|
||||
* @return bool
|
||||
*/
|
||||
function phpunit_bootstrap_is_cygwin() {
|
||||
if (empty($_SERVER['SHELL']) or empty($_SERVER['OS'])) {
|
||||
if (empty($_SERVER['OS']) or $_SERVER['OS'] !== 'Windows_NT') {
|
||||
return false;
|
||||
|
||||
} else if (!empty($_SERVER['SHELL']) and $_SERVER['SHELL'] === '/bin/bash') {
|
||||
return true;
|
||||
|
||||
} else if (!empty($_SERVER['TERM']) and $_SERVER['TERM'] === 'cygwin') {
|
||||
return true;
|
||||
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
return ($_SERVER['OS'] === 'Windows_NT' and $_SERVER['SHELL'] === '/bin/bash');
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user