mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Merge pull request #3941 from beganovich/v2-undo-setup-changes
Undo setup changes
This commit is contained in:
commit
b20c0a5ff0
@ -60,14 +60,6 @@ class SystemHealth
|
|||||||
$system_health = false;
|
$system_health = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!self::checkNode()) {
|
|
||||||
$system_health = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!self::checkNpm()) {
|
|
||||||
$system_health = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'system_health' => $system_health,
|
'system_health' => $system_health,
|
||||||
'extensions' => self::extensions(),
|
'extensions' => self::extensions(),
|
||||||
@ -90,13 +82,14 @@ class SystemHealth
|
|||||||
exec('node -v', $foo, $exitCode);
|
exec('node -v', $foo, $exitCode);
|
||||||
|
|
||||||
if ($exitCode === 0) {
|
if ($exitCode === 0) {
|
||||||
return true;
|
return $foo[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function checkNpm()
|
public static function checkNpm()
|
||||||
@ -105,14 +98,14 @@ class SystemHealth
|
|||||||
exec('npm -v', $foo, $exitCode);
|
exec('npm -v', $foo, $exitCode);
|
||||||
|
|
||||||
if ($exitCode === 0) {
|
if ($exitCode === 0) {
|
||||||
return true;
|
return $foo[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
}catch (\Exception $e) {
|
||||||
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static function simpleDbCheck() :bool
|
private static function simpleDbCheck() :bool
|
||||||
|
Loading…
x
Reference in New Issue
Block a user