update-self: fix wrong work directory, better work directory checking

master
Andrew Dolgov 12 years ago
parent 9435c4dca4
commit 639ad60035

@ -1,6 +1,7 @@
<?php <?php
function update_self($link, $force = false) { function update_self($link, $force = false) {
$work_dir = dirname(__FILE__); // __FILE__ is in include/ so we need to go one level up
$work_dir = dirname(dirname(__FILE__));
$parent_dir = dirname($work_dir); $parent_dir = dirname($work_dir);
if (!is_writable($work_dir) && !is_writable("$parent_dir")) { if (!is_writable($work_dir) && !is_writable("$parent_dir")) {
@ -8,6 +9,11 @@
exit; exit;
} }
if (!file_exists("$work_dir/config.php") || !file_exists("$work_dir/include/sanity_check.php")) {
_debug("Work directory $work_dir doesn't look like tt-rss installation.");
exit;
}
if (!is_writable(sys_get_temp_dir())) { if (!is_writable(sys_get_temp_dir())) {
_debug("System temporary directory should be writable as current user."); _debug("System temporary directory should be writable as current user.");
exit; exit;

Loading…
Cancel
Save