dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix. Do not try `fetch` git repo when open system page. (#2903) 

Fix. Symbol '^' should be inside double quotes on Windows system.

Fetch may be not possible in some cases but git still be valid.
I test git status on repo with changes. And it also returns 0 as
return code.
This commit is contained in:
Alexey Melnichuk 2017-11-07 18:22:33 +03:00 committed by FusionPBX
parent 5e63132373
commit 1fdec2bda6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/system/system.php
View File

@ -97,7 +97,7 @@
if(file_exists($git_path)){ if(file_exists($git_path)){
$git_exe = 'git'; $git_exe = 'git';
if (strtoupper(substr(PHP_OS, 0, 3)) === 'SUN') { $git_exe = shell_exec('which git'); } if (strtoupper(substr(PHP_OS, 0, 3)) === 'SUN') { $git_exe = shell_exec('which git'); }
exec($git_exe.' --git-dir='.$git_path.' fetch', $dummy, $returnCode); exec($git_exe.' --git-dir='.$git_path.' status', $dummy, $returnCode);
if($returnCode){ if($returnCode){
echo "<tr>\n"; echo "<tr>\n";
echo " <td width='20%' class=\"vncell\" style='text-align: left;'>\n"; echo " <td width='20%' class=\"vncell\" style='text-align: left;'>\n";
@ -117,7 +117,7 @@
$git_origin = preg_replace('/\.git$/','',$git_origin); $git_origin = preg_replace('/\.git$/','',$git_origin);
$git_status = shell_exec($git_exe.' --git-dir='.$git_path.' status | grep "Your branch"'); $git_status = shell_exec($git_exe.' --git-dir='.$git_path.' status | grep "Your branch"');
rtrim($git_status); rtrim($git_status);
$git_age = shell_exec($git_exe.' --git-dir='.$git_path.' log --pretty=format:%at HEAD^!'); $git_age = shell_exec($git_exe.' --git-dir='.$git_path.' log --pretty=format:%at "HEAD^!"');
rtrim($git_age); rtrim($git_age);
$git_date = DateTime::createFromFormat('U', $git_age); $git_date = DateTime::createFromFormat('U', $git_age);
$git_age = $git_date->diff(new DateTime('now')); $git_age = $git_date->diff(new DateTime('now'));