From af0c99e09b873397a4c31764113f5b8933a4bdcb Mon Sep 17 00:00:00 2001
From: Pecusx <Pecus@poczta.fm>
Date: Mon, 31 Oct 2016 18:57:22 +0100
Subject: [PATCH] Better (???) update procedure.

---
 html/changeconf.php |  1 +
 html/update.php     | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/html/changeconf.php b/html/changeconf.php
index bff3349..baf5d54 100755
--- a/html/changeconf.php
+++ b/html/changeconf.php
@@ -54,6 +54,7 @@ if (isset($msg)) {
 			echo "</script>\r\n";
 		} else {
 			echo "Update from github canceled.<br>\r\n";
+			$end = shell_exec('sudo ./scripts/cancel_update.sh');
 			echo "<script>\r\n";
 			echo "// redirect to main after 2 seconds\r\n";
 			echo "window.setTimeout(function() {\r\n";
diff --git a/html/update.php b/html/update.php
index 032bfe1..56adbae 100644
--- a/html/update.php
+++ b/html/update.php
@@ -11,13 +11,24 @@
 <hr>
 Update to last build from github<br><pre>
 <?php
-echo "Your PiRadio version: <b>5.4c</b>. Last commit: <b>".date("F d Y H:i:s",filemtime("/usr/share/radio/README.md"))."</b>.";
+$end = shell_exec('sudo ./scripts/github_download.sh');
+$local_version_date = filemtime("/usr/share/radio/README.md");
+$local_version = str_replace("\n","",file_get_contents( "/usr/share/radio/version" ));
+$github_version_date = filemtime("/usr/share/piradio-mini-master/README.md");
+$github_version = str_replace("\n","",file_get_contents( "/usr/share/piradio-mini-master/version" ));
+echo "Your PiRadio version: <b>".$local_version."</b>. Last commit: <b>".date("d.m.Y H:i:s",$local_version_date)."</b>.<br>";
+if (is_numeric($github_version_date)) {
+	echo "GitHub PiRadio version: <b>".$github_version."</b>. Last commit: <b>".date("d.m.Y H:i:s",$github_version_date)."</b>.";
+	echo "<br><br>Do you really want to update your PiRadio from github repository.<br>";
+	echo "<br>After update your PiRadio will be rebooted!</pre>";
+} else {
+	echo "<b>Problem with download update files from GitHub!!!</b>.</pre>";
+}
 ?>
-<br>Do you really want to update your PiRadio from github repository.<br>
-After update your PiRadio will be rebooted!</pre>
 <form action="changeconf.php?file=update" method="post">
+<?php if (is_numeric($github_version_date)) { ?>
 <button type="submit" name="submit" value="yes">Yes - update and reboot</button>
+<?php } ?>
 <button type="submit" name="submit" value="no">No - no update</button>
 <hr>
 </body>
-