Skip to content
Permalink
Browse files

Merge branch 'MDL-34885_23' of git://github.com/timhunt/moodle into M…

…OODLE_23_STABLE
  • Loading branch information...
stronk7 committed Aug 15, 2012
2 parents 833e135 + ba338db commit e154c1b6da51628734ab9c1f06134f37944ed418
Showing with 10 additions and 2 deletions.
  1. +10 −2 lib/phpunit/bootstraplib.php
@@ -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');
}

0 comments on commit e154c1b

Please sign in to comment.
You can’t perform that action at this time.