diff options
Diffstat (limited to 'cli')
| -rwxr-xr-x | cli/do-install.php | 6 | ||||
| -rw-r--r-- | cli/i18n/ignore/en-us.php | 1 | ||||
| -rwxr-xr-x | cli/prepare.php | 4 |
3 files changed, 1 insertions, 10 deletions
diff --git a/cli/do-install.php b/cli/do-install.php index 4d76b9acb..296b2bd31 100755 --- a/cli/do-install.php +++ b/cli/do-install.php @@ -2,7 +2,7 @@ <?php require(__DIR__ . '/_cli.php'); -if (!file_exists(DATA_PATH . '/do-install.txt')) { +if (file_exists(DATA_PATH . '/applied_migrations.txt')) { fail('FreshRSS seems to be already installed!' . "\n" . 'Please use `./cli/reconfigure.php` instead.', EXIT_CODE_ALREADY_EXISTS); } @@ -116,8 +116,4 @@ if (!setupMigrations()) { fail('FreshRSS access right problem while creating migrations version file!'); } -if (!deleteInstall()) { - fail('FreshRSS access right problem while deleting install file!'); -} - done(); diff --git a/cli/i18n/ignore/en-us.php b/cli/i18n/ignore/en-us.php index acb76eb6b..a57fd942c 100644 --- a/cli/i18n/ignore/en-us.php +++ b/cli/i18n/ignore/en-us.php @@ -684,7 +684,6 @@ return array( 'install.language._', 'install.language.choose', 'install.language.defined', - 'install.not_deleted', 'install.ok', 'install.session.nok', 'install.step', diff --git a/cli/prepare.php b/cli/prepare.php index ad027644b..1128def91 100755 --- a/cli/prepare.php +++ b/cli/prepare.php @@ -23,10 +23,6 @@ foreach ($dirs as $dir) { $ok &= touch(DATA_PATH . $dir . '/index.html'); } -if (!is_file(DATA_PATH . '/config.php')) { - $ok &= touch(DATA_PATH . '/do-install.txt'); -} - file_put_contents(DATA_PATH . '/.htaccess', "# Apache 2.2\n" . "<IfModule !mod_authz_core.c>\n" . |