mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct check for command results.

Browse Source
This commit is contained in:
Tony Murray
2016-07-01 16:16:23 -05:00
parent 2dbec67088
commit 080c59c387
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
validate.php
View File

@@ -85,11 +85,13 @@ if($versions['local_branch'] != 'master') {
print_warn("Your local git branch is not master, this will prevent automatic updates."); print_warn("Your local git branch is not master, this will prevent automatic updates.");
} }
// check for modified files
$modifiedcmd = 'git diff --name-only --exit-code'; $modifiedcmd = 'git diff --name-only --exit-code';
if($username === 'root') { if($username === 'root') {
$modifiedcmd = 'su '.$config['user'].' -c "'.$modifiedcmd.'"'; $modifiedcmd = 'su '.$config['user'].' -c "'.$modifiedcmd.'"';
} }
if(exec($modifiedcmd, $cmdoutput, $code) !== 0) { exec($modifiedcmd, $cmdoutput, $code);
if($code !== 0) {
print_warn("Your local git contains modified files, this could prevent automatic updates.\nModified files:"); print_warn("Your local git contains modified files, this could prevent automatic updates.\nModified files:");
echo(implode("\n", $cmdoutput) . "\n"); echo(implode("\n", $cmdoutput) . "\n");
} }