diff options
Diffstat (limited to 'plugins/updater/init.php')
| -rw-r--r-- | plugins/updater/init.php | 74 |
1 files changed, 54 insertions, 20 deletions
diff --git a/plugins/updater/init.php b/plugins/updater/init.php index d940aefeb..8a7c8a9ca 100644 --- a/plugins/updater/init.php +++ b/plugins/updater/init.php @@ -79,7 +79,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 +90,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 +109,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 +133,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 +152,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 +181,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 +189,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 +230,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 +240,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."); @@ -271,10 +298,12 @@ class Updater extends Plugin { _debug("Please backup your tt-rss directory before continuing. Your database will not be modified."); _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($link, $input == 'force'); } function get_prefs_js() { @@ -294,9 +323,14 @@ class Updater extends Plugin { 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 { |