From: nee Date: Sun, 26 Nov 2017 21:14:30 +0000 (+0100) Subject: Don't write the config file when --skip-config flag is given to the installer. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fdd3d63098f6411b2bec99fbca96543866374de7;p=quix0rs-gnu-social.git Don't write the config file when --skip-config flag is given to the installer. * scripts/installer_cli.php: Read the arguments list before checking if the config file is writeable. --- diff --git a/lib/installer.php b/lib/installer.php index 346c706d61..e73216f18d 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -85,7 +85,7 @@ abstract class Installer $pass = true; $config = INSTALLDIR.'/config.php'; - if (file_exists($config)) { + if (!$this->skipConfig && file_exists($config)) { if (!is_writable($config) || filesize($config) > 0) { if (filesize($config) == 0) { $this->warning('Config file "config.php" already exists and is empty, but is not writable.'); @@ -126,14 +126,16 @@ abstract class Installer } // @fixme this check seems to be insufficient with Windows ACLs - if (!is_writable(INSTALLDIR)) { + if (!$this->skipConfig && !is_writable(INSTALLDIR)) { $this->warning(sprintf('Cannot write config file to: %s

', INSTALLDIR), sprintf('On your server, try this command: chmod a+w %s', INSTALLDIR)); $pass = false; } // Check the subdirs used for file uploads - $fileSubdirs = array('avatar', 'file'); + // TODO get another flag for this --skipFileSubdirCreation + if (!$this->skipConfig) { + $fileSubdirs = array($this->avatarDir, $this->fileDir); foreach ($fileSubdirs as $fileSubdir) { $fileFullPath = INSTALLDIR."/$fileSubdir"; if (!file_exists($fileFullPath)) { @@ -148,7 +150,7 @@ abstract class Installer $pass = false; } } - + } return $pass; } @@ -580,10 +582,10 @@ abstract class Installer return false; } + if (!$this->skipConfig) { // Make sure we can write to the file twice $oldUmask = umask(000); - if (!$this->skipConfig) { $this->updateStatus("Writing config file..."); $res = $this->writeConf(); @@ -616,12 +618,12 @@ abstract class Installer $this->updateStatus("Can't write to config file.", true); return false; } - } // Restore original umask umask($oldUmask); // Set permissions back to something decent chmod(INSTALLDIR.'/config.php', 0644); + } $scheme = $this->ssl === 'always' ? 'https' : 'http'; $link = "{$scheme}://{$this->server}/{$this->path}"; diff --git a/scripts/install_cli.php b/scripts/install_cli.php index 815418aaab..da5f0f4b0c 100755 --- a/scripts/install_cli.php +++ b/scripts/install_cli.php @@ -47,10 +47,10 @@ class CliInstaller extends Installer */ function main() { + if ($this->prepare()) { if (!$this->checkPrereqs()) { return false; } - if ($this->prepare()) { return $this->handle(); } else { $this->showHelp();