summaryrefslogtreecommitdiff
path: root/plugins/updater/init.php
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/updater/init.php')
-rw-r--r--plugins/updater/init.php111
1 files changed, 80 insertions, 31 deletions
diff --git a/plugins/updater/init.php b/plugins/updater/init.php
index d940aefeb..fa283c8be 100644
--- a/plugins/updater/init.php
+++ b/plugins/updater/init.php
@@ -1,7 +1,6 @@
<?php
class Updater extends Plugin {
- private $link;
private $host;
function about() {
@@ -12,7 +11,6 @@ class Updater extends Plugin {
}
function init($host) {
- $this->link = $host->get_link();
$this->host = $host;
$host->add_hook($host::HOOK_PREFS_TAB, $this);
@@ -22,7 +20,7 @@ class Updater extends Plugin {
$this);
}
- function update_self_step($link, $step, $params, $force = false) {
+ function update_self_step($step, $params, $force = false) {
// __FILE__ is in plugins/updater so we need to go one level up
$work_dir = dirname(dirname(dirname(__FILE__)));
$parent_dir = dirname($work_dir);
@@ -42,7 +40,7 @@ class Updater extends Plugin {
case 0:
array_push($log, "Work directory: $work_dir");
- if (!is_writable($work_dir) && !is_writable("$parent_dir")) {
+ if (!is_writable($work_dir) || !is_writable("$parent_dir")) {
$user = posix_getpwuid(posix_geteuid());
$user = $user["name"];
array_push($log, "Both tt-rss and parent directories should be writable as current user ($user).");
@@ -59,6 +57,10 @@ class Updater extends Plugin {
$stop = true; break;
}
+ // bah, also humbug
+ putenv("PATH=" . getenv("PATH") . PATH_SEPARATOR . "/bin" .
+ PATH_SEPARATOR . "/usr/bin");
+
array_push($log, "Checking for tar...");
$system_rc = 0;
@@ -79,7 +81,6 @@ class Updater extends Plugin {
$stop = true; break;
}
-
array_push($log, "Checking for latest version...");
$version_info = json_decode(fetch_file_contents("http://tt-rss.org/version.php"),
@@ -91,7 +92,7 @@ class Updater extends Plugin {
}
$target_version = $version_info["version"];
- $target_dir = "$parent_dir/tt-rss-$target_version";
+ $target_dir = "$parent_dir/Tiny-Tiny-RSS-$target_version";
array_push($log, "Target version: $target_version");
$params["target_version"] = $target_version;
@@ -110,7 +111,7 @@ class Updater extends Plugin {
case 1:
$target_version = $params["target_version"];
- array_push($log, "Downloading checksums...");
+/* array_push($log, "Downloading checksums...");
$md5sum_data = fetch_file_contents("http://tt-rss.org/download/md5sum.txt");
if (!$md5sum_data) {
@@ -134,16 +135,18 @@ class Updater extends Plugin {
$stop = true; break;
}
- $params["target_md5sum"] = $target_md5sum;
+ $params["target_md5sum"] = $target_md5sum; */
+
+ array_push($log, "Proceeding to download...");
break;
case 2:
$target_version = $params["target_version"];
- $target_md5sum = $params["target_md5sum"];
+ // $target_md5sum = $params["target_md5sum"];
array_push($log, "Downloading distribution tarball...");
- $tarball_url = "http://tt-rss.org/download/tt-rss-$target_version.tar.gz";
+ $tarball_url = "https://github.com/gothfox/Tiny-Tiny-RSS/archive/$target_version.tar.gz";
$data = fetch_file_contents($tarball_url);
if (!$data) {
@@ -151,14 +154,14 @@ class Updater extends Plugin {
$stop = true; break;
}
- array_push($log, "Verifying tarball checksum...");
+ /* array_push($log, "Verifying tarball checksum...");
$test_md5sum = md5($data);
if ($test_md5sum != $target_md5sum) {
array_push($log, "Downloaded checksum doesn't match (got $test_md5sum, expected $target_md5sum).");
$stop = true; break;
- }
+ } */
$tmp_file = tempnam(sys_get_temp_dir(), 'tt-rss');
array_push($log, "Saving download to $tmp_file");
@@ -180,14 +183,6 @@ class Updater extends Plugin {
$stop = true; break;
}
- $old_dir = tmpdirname($parent_dir, "tt-rss-old");
-
- array_push($log, "Renaming tt-rss directory to ".basename($old_dir));
- if (!rename($work_dir, $old_dir)) {
- array_push($log, "Unable to rename tt-rss directory.");
- $stop = true; break;
- }
-
array_push($log, "Extracting tarball...");
system("tar zxf $tmp_file", $system_rc);
@@ -196,7 +191,20 @@ class Updater extends Plugin {
$stop = true; break;
}
- $target_dir = "$parent_dir/tt-rss-$target_version";
+ $target_dir = "$parent_dir/Tiny-Tiny-RSS-$target_version";
+
+ if (!is_dir($target_dir)) {
+ array_push($log, "Target directory ($target_dir) not found.");
+ $stop = true; break;
+ }
+
+ $old_dir = tmpdirname($parent_dir, "tt-rss-old");
+
+ array_push($log, "Renaming tt-rss directory to ".basename($old_dir));
+ if (!rename($work_dir, $old_dir)) {
+ array_push($log, "Unable to rename tt-rss directory.");
+ $stop = true; break;
+ }
array_push($log, "Renaming target directory...");
if (!rename($target_dir, $work_dir)) {
@@ -224,6 +232,7 @@ class Updater extends Plugin {
CACHE_DIR,
CACHE_DIR . "/export",
CACHE_DIR . "/images",
+ CACHE_DIR . "/js",
CACHE_DIR . "/simplepie",
ICONS_DIR,
LOCK_DIRECTORY);
@@ -233,6 +242,26 @@ class Updater extends Plugin {
chmod($dir, 0777);
}
+ if (ICONS_DIR == "feed-icons") {
+ array_push($log, "Migrating feed icons...");
+
+ $icons = glob("$old_dir/feed-icons/*.ico");
+ $icons_copied = 0;
+
+ foreach ($icons as $icon) {
+ $icon = basename($icon);
+
+ if (copy("$old_dir/feed-icons/$icon", "$work_dir/feed-icons/$icon")) {
+ ++$icons_copied;
+ }
+ }
+
+ array_push($log, "Done; $icons_copied files copied");
+
+ } else {
+ array_push($log, "Not migrating feed icons, ICONS_DIR modified.");
+ }
+
array_push($log, "Upgrade completed.");
array_push($log, "Your old tt-rss directory is saved at $old_dir. ".
"Please migrate locally modified files (if any) and remove it.");
@@ -248,13 +277,13 @@ class Updater extends Plugin {
return array("step" => $step, "stop" => $stop, "params" => $params, "log" => $log);
}
- function update_self_cli($link, $force = false) {
+ function update_self_cli($force = false) {
$step = 0;
$stop = false;
$params = array();
while (!$stop) {
- $rc = $this->update_self_step($link, $step, $params, $force);
+ $rc = $this->update_self_step($step, $params, $force);
$params = $rc['params'];
$stop = $rc['stop'];
@@ -267,14 +296,18 @@ class Updater extends Plugin {
}
function update_self($args) {
- _debug("Warning: self-updating is experimental. Use at your own risk.");
- _debug("Please backup your tt-rss directory before continuing. Your database will not be modified.");
+ _debug("READ THE FOLLOWING BEFORE CONTINUING!");
+ _debug("* It is suggested to backup your tt-rss directory first.");
+ _debug("* Your database will not be modified.");
+ _debug("* Your current tt-rss installation directory will not be modified. It will be renamed and left in the parent directory. You will be able to migrate all your customized files after update finishes.");
_debug("Type 'yes' to continue.");
- if (read_stdin() != 'yes')
+ $input = read_stdin();
+
+ if ($input != 'yes' && $input != 'force')
exit;
- $this->update_self_cli($link, in_array("-force", $args));
+ $this->update_self_cli($input == 'force');
}
function get_prefs_js() {
@@ -288,15 +321,20 @@ class Updater extends Plugin {
print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Update Tiny Tiny RSS')."\">";
if ($_SESSION["pref_last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
- $_SESSION["version_data"] = @check_for_update($this->link);
+ $_SESSION["version_data"] = @check_for_update();
$_SESSION["pref_last_version_check"] = time();
}
if (is_array($_SESSION["version_data"])) {
$version = $_SESSION["version_data"]["version"];
+ $version_id = $_SESSION["version_data"]["version_id"];
print_notice(T_sprintf("New version of Tiny Tiny RSS is available (%s).", "<b>$version</b>"));
- print "<p><button dojoType=\"dijit.form.Button\" onclick=\"return updateSelf()\">".
+ $details = "http://tt-rss.org/redmine/versions/$version_id";
+
+ print "<p><button onclick=\"window.open('$details')\" dojoType=\"dijit.form.Button\">".__("See the release notes")."</button>";
+
+ print " <button dojoType=\"dijit.form.Button\" onclick=\"return updateSelf()\">".
__('Update Tiny Tiny RSS')."</button></p>";
} else {
@@ -308,11 +346,18 @@ class Updater extends Plugin {
}
function updateSelf() {
+ print_warning(__("Do not close this dialog until updating is finished."));
+
print "<form style='display : block' name='self_update_form' id='self_update_form'>";
- print "<div class='error'>".__("Do not close this dialog until updating is finished. Backup your tt-rss directory before continuing.")."</div>";
+ print "<style type='text/css'>
+ li.notice { font-style : italic; color : red; }
+ </style>";
print "<ul class='selfUpdateList' id='self_update_log'>";
+ print "<li class='notice'>" .__("It is suggested to backup your tt-rss directory first.") . "</li>";
+ print "<li class='notice'>" . __("Your database will not be modified.") . "</li>";
+ print "<li class='notice'>" . __("Your current tt-rss installation directory will not be modified. It will be renamed and left in the parent directory. You will be able to migrate all your customized files after update finishes.") . "</li>";
print "<li>" . __("Ready to update.") . "</li>";
print "</ul>";
@@ -331,9 +376,13 @@ class Updater extends Plugin {
$force = (bool) $_REQUEST["force"];
if (($_SESSION["access_level"] >= 10 || SINGLE_USER_MODE) && CHECK_FOR_NEW_VERSION) {
- print json_encode($this->update_self_step($this->link, $step, $params, $force));
+ print json_encode($this->update_self_step($step, $params, $force));
}
}
+ function api_version() {
+ return 2;
+ }
+
}
?>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-26 16:08:36 +0000