mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-14 17:59:41 +00:00
Code Issues Projects Releases Wiki Activity

Fixed wrong git commit hash parsing, fixes #295, closes #297 (#299)

Browse Source
This commit is contained in:
SOFe 2017-01-27 18:49:54 +08:00 committed by Dylan K. Taylor
parent 09a6776674
commit 713ee753e4
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pocketmine/PocketMine.php
View File

@ -470,9 +470,18 @@ namespace pocketmine {
exit(1); //Exit with error exit(1); //Exit with error
} }
if(file_exists(\pocketmine\PATH . ".git/refs/heads/master")){ //Found Git information! if(file_exists(\pocketmine\PATH . ".git/HEAD")){ //Found Git information!
define('pocketmine\GIT_COMMIT', strtolower(trim(file_get_contents(\pocketmine\PATH . ".git/refs/heads/master")))); $ref = trim(file_get_contents(\pocketmine\PATH . ".git/HEAD"));
}else{ //Unknown :( if(preg_match('/^[0-9a-f]{40}$/i', $ref)){
define('pocketmine\GIT_COMMIT', strtolower($ref));
}elseif(substr($ref, 0, 5) === "ref: "){
$refFile = \pocketmine\PATH . ".git/" . substr($ref, 5);
if(is_file($refFile)){
define('pocketmine\GIT_COMMIT', strtolower(trim(file_get_contents($refFile))));
}
}
}
if(!defined('pocketmine\GIT_COMMIT')){ //Unknown :(
define('pocketmine\GIT_COMMIT', str_repeat("00", 20)); define('pocketmine\GIT_COMMIT', str_repeat("00", 20));
} }