From 2fc64df38e2c870cf78622e88fb8177872bf9015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Mon, 20 Jan 2020 17:59:16 +0100 Subject: [PATCH] small fixes in selftest --- www/internals/modules/selftest.php | 4 ++-- www/internals/utils.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/internals/modules/selftest.php b/www/internals/modules/selftest.php index ec6b6ca..f5ce7e5 100644 --- a/www/internals/modules/selftest.php +++ b/www/internals/modules/selftest.php @@ -416,7 +416,7 @@ class SelfTest implements IWebsiteModule '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); if (!$ok) @@ -641,4 +641,4 @@ class SelfTest implements IWebsiteModule { return ['result'=>'ok', 'message' => '']; } -} \ No newline at end of file +} diff --git a/www/internals/utils.php b/www/internals/utils.php index ee2a0be..58b2be5 100644 --- a/www/internals/utils.php +++ b/www/internals/utils.php @@ -281,7 +281,7 @@ function curl_http_request($url) $errmsg = curl_error( $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 ]; }