Mikescher/www.mikescher.com
1
0
Fork 0
Code Actions

small fixes in selftest

Browse Source
This commit is contained in:
Mike Schwörer 2020-01-20 17:59:16 +01:00
parent 9c8e61b203
commit 2fc64df38e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/internals/modules/selftest.php
View File

@ -416,7 +416,7 @@ class SelfTest implements IWebsiteModule
'exception' => null, 'exception' => null,
]; ];
$r = exec('git rev-parse --abbrev-ref HEAD'); $r = exec('git status 2>&1');
$ok = (strpos($r, 'Your branch is up to date with') !== false) && (strpos($r, 'nothing to commit, working tree clean') !== false); $ok = (strpos($r, 'Your branch is up to date with') !== false) && (strpos($r, 'nothing to commit, working tree clean') !== false);
if (!$ok) if (!$ok)
@ -641,4 +641,4 @@ class SelfTest implements IWebsiteModule
{ {
return ['result'=>'ok', 'message' => '']; return ['result'=>'ok', 'message' => ''];
} }
} }

2
www/internals/utils.php
View File

@ -281,7 +281,7 @@ function curl_http_request($url)
$errmsg = curl_error( $ch ); $errmsg = curl_error( $ch );
curl_close($ch); curl_close($ch);
return [ 'output'=>$output, 'statuscode'=>$httpcode, 'redirect'=>$redirect, 'erronum'=>$errnum, 'errorstr'=>$errmsg ]; return [ 'output'=>$output, 'statuscode'=>$httpcode, 'redirect'=>$redirect, 'errnum'=>$errnum, 'errstr'=>$errmsg ];
} }