From 16e0fb4a5792caf70b1b1fbce2b7b594f00bd858 Mon Sep 17 00:00:00 2001
From: Daniil Gentili <daniil@daniil.it>
Date: Thu, 1 Mar 2018 13:28:16 +0100
Subject: [PATCH] Improve phar self-update mechanism

---
 makephar.php      | 4 +---
 phar.php          | 8 +++-----
 tests/makephar.sh | 1 +
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/makephar.php b/makephar.php
index 88ad3ee03..2b5dac675 100755
--- a/makephar.php
+++ b/makephar.php
@@ -29,9 +29,7 @@ if (basename($backtrace[0]["file"]) === "phar.php") {
     chdir(dirname($backtrace[1]["file"]));
     if (!isset($phar_debug)) file_put_contents($backtrace[0]["file"], file_get_contents("https://phar.madelineproto.xyz/phar.php?v=new"));
 }
-if ((new Phar(__FILE__))[".git/refs/heads/master"]->getContent() !== file_get_contents("https://phar.madelineproto.xyz/release?v=new") && !isset($phar_debug)) {
-    file_put_contents(__FILE__, file_get_contents("https://phar.madelineproto.xyz/madeline.phar?v=new"));
-}
+
 Phar::interceptFileFuncs(); 
 Phar::mapPhar("'.$argv[2].'"); 
 require_once "phar://'.$argv[2].'/vendor/autoload.php"; 
diff --git a/phar.php b/phar.php
index 82c696f8c..e029a003e 100644
--- a/phar.php
+++ b/phar.php
@@ -1,10 +1,8 @@
 <?php
 
-if (!file_exists('madeline.phar')) {
+if (!file_exists('madeline.phar') || !file_exists('madeline.phar.version') || file_get_contents('madeline.phar.version') !== file_get_contents('https://phar.madelineproto.xyz/release?v=new')) {
     file_put_contents('madeline.phar', file_get_contents('https://phar.madelineproto.xyz/madeline.phar?v=new'));
+    file_put_contents('madeline.phar.version', file_get_contents('https://phar.madelineproto.xyz/release?v=new'));
 }
-require 'madeline.phar';
 
-if (trim(file_get_contents('phar://madeline.phar/.git/refs/heads/master')) !== trim(file_get_contents('https://phar.madelineproto.xyz/release?v=new'))) {
-    file_put_contents('madeline.phar', file_get_contents('https://phar.madelineproto.xyz/madeline.phar?v=new'));
-}
+require 'madeline.phar';
diff --git a/tests/makephar.sh b/tests/makephar.sh
index b3607b542..fe3f806be 100755
--- a/tests/makephar.sh
+++ b/tests/makephar.sh
@@ -41,6 +41,7 @@ ssh-add madeline_rsa
 git clone git@github.com:danog/MadelineProtoPhar
 cd MadelineProtoPhar
 cp ../madeline.phar .
+cp ../phar.php .
 echo -n $TRAVIS_COMMIT > release
 git add -A
 git commit -am "Release $TRAVIS_COMMIT"