mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 04:10:38 +02:00
Code Issues Releases Wiki Activity

Corrected git path issue.

Browse Source
This commit is contained in:
Cameron
2016-06-25 11:45:45 -07:00
parent b6194499ce
commit ab683a8954
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
e107_handlers/file_class.php
View File

@@ -1267,26 +1267,28 @@ class e_file
default: default:
$dir = e_ROOT; $dir = e_ROOT;
} }
$cmd = 'cd '.$dir;
// return $cmd;
$mes->addDebug($cmd); // $cmd1 = 'cd '.$dir;
$text = `$cmd 2>&1`; $cmd2 = 'cd '.$dir.'; '.$gitPath.' reset --hard'; // Remove any local changes.
$cmd3 = 'cd '.$dir.'; '.$gitPath.' pull'; // Run Pull request
// Remove any local changes.
$cmd = $gitPath.' --git-dir='.$dir.'/.git reset --hard';
$mes->addDebug($cmd);
$text .= `$cmd 2>&1`;
// Run Pull request // $mes->addDebug($cmd1);
$cmd = $gitPath.' --git-dir='.$dir.'/.git pull'; $mes->addDebug($cmd2);
$mes->addDebug($cmd); $mes->addDebug($cmd3);
$text .= `$cmd 2>&1`;
// return false;
// $text = `$cmd1 2>&1`;
$text = `$cmd2 2>&1`;
$text .= `$cmd3 2>&1`;
// $text .= `$cmd4 2>&1`;
// $text .= `$cmd5 2>&1`;
return print_a($text,true); return print_a($text,true);