diff options
| author | Andrew Dolgov <[email protected]> | 2021-03-07 20:11:54 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2021-03-07 20:11:54 +0300 |
| commit | 603cc8963871fe382ee71a083692ff0d81460322 (patch) | |
| tree | 1736fc33bee08a6df5309cf0b87691d1bb8b12be /classes | |
| parent | f4d0e7bb6d080b8dc25090b1aa7b21be70c6ec22 (diff) | |
check updates one plugin at a time
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/pref/prefs.php | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 592bdb705..77b57b4d8 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -1049,7 +1049,7 @@ class Pref_Prefs extends Handler_Protected { } $rv = array_values(array_filter($rv, function ($item) { - return !empty($item["rv"]["o"]); + return $item["rv"]["need_update"]; })); return $rv; @@ -1071,10 +1071,10 @@ class Pref_Prefs extends Handler_Protected { $proc = proc_open("git fetch -q origin -a && git log HEAD..origin/master --oneline", $descriptorspec, $pipes, $plugin_dir); if (is_resource($proc)) { - $rv["o"] = stream_get_contents($pipes[1]); - $rv["e"] = stream_get_contents($pipes[2]); - $status = proc_close($proc); - $rv["s"] = $status; + $rv["stdout"] = stream_get_contents($pipes[1]); + $rv["stderr"] = stream_get_contents($pipes[2]); + $rv["git_status"] = proc_close($proc); + $rv["need_update"] = !empty($rv["stdout"]); } } @@ -1098,10 +1098,9 @@ class Pref_Prefs extends Handler_Protected { $proc = proc_open("git fetch origin -a && git log HEAD..origin/master --oneline && git pull --ff-only origin master", $descriptorspec, $pipes, $plugin_dir); if (is_resource($proc)) { - $rv["o"] = stream_get_contents($pipes[1]); - $rv["e"] = stream_get_contents($pipes[2]); - $status = proc_close($proc); - $rv["s"] = $status; + $rv["stdout"] = stream_get_contents($pipes[1]); + $rv["stderr"] = stream_get_contents($pipes[2]); + $rv["git_status"] = proc_close($proc); } } |