mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 02:08:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'ee08286ecaf76cd11914c5a3e914093b991c32db'

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-01-04 12:08:47 +00:00
parent aaa81fb346 ee08286eca
commit cbc6bb29bc
2 changed files with 72 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/PocketMine.php
View File

@ -25,6 +25,7 @@ namespace pocketmine {
use pocketmine\thread\ThreadManager;
use pocketmine\utils\Filesystem;
use pocketmine\utils\Git;
use pocketmine\utils\MainLogger;
use pocketmine\utils\Process;
use pocketmine\utils\ServerKiller;
@ -194,13 +195,7 @@ namespace pocketmine {
$gitHash = str_repeat("00", 20);
if(\Phar::running(true) === ""){
$gitPath = \pocketmine\PATH;
if(Process::execute("git -C \"$gitPath\" rev-parse HEAD", $out) === 0 and $out !== false and strlen($out = trim($out)) === 40){
$gitHash = trim($out);
if(Process::execute("git -C \"$gitPath\" diff --quiet") === 1 or Process::execute("git -C \"$gitPath\" diff --cached --quiet") === 1){ //Locally-modified
$gitHash .= "-dirty";
}
}
$gitHash = Git::getRepositoryStatePretty(\pocketmine\PATH);
}else{
$phar = new \Phar(\Phar::running(false));
$meta = $phar->getMetadata();