mirror of
https://github.com/lkddi/nexusphp.git
synced 2026-04-23 19:37:23 +08:00
do not save settings when upgrade
This commit is contained in:
@@ -91,18 +91,6 @@ class NexusUpdate extends Command
|
|||||||
$this->doLog("Code update successfully, run this command without --tag option to run the upgrade please!", 'warn');
|
$this->doLog("Code update successfully, run this command without --tag option to run the upgrade please!", 'warn');
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if ($includeComposer) {
|
|
||||||
$requireCommand = 'composer';
|
|
||||||
if (!command_exists($requireCommand)) {
|
|
||||||
$this->doLog("Error: require $requireCommand");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
$command = "composer install";
|
|
||||||
$log = "Running $command ...";
|
|
||||||
$this->doLog($log);
|
|
||||||
$this->update->executeCommand($command);
|
|
||||||
}
|
|
||||||
|
|
||||||
//Step 2
|
//Step 2
|
||||||
$log = sprintf('Step %s, %s, cli skip...', $step, $this->update->getStepName($step));
|
$log = sprintf('Step %s, %s, cli skip...', $step, $this->update->getStepName($step));
|
||||||
$this->doLog($log);
|
$this->doLog($log);
|
||||||
@@ -117,7 +105,7 @@ class NexusUpdate extends Command
|
|||||||
$log = sprintf('Step %s, %s...', $step, $this->update->getStepName($step));
|
$log = sprintf('Step %s, %s...', $step, $this->update->getStepName($step));
|
||||||
$this->doLog($log);
|
$this->doLog($log);
|
||||||
$settingTableRows = $this->update->listSettingTableRows();
|
$settingTableRows = $this->update->listSettingTableRows();
|
||||||
$settings = $settingTableRows['settings'];
|
// $settings = $settingTableRows['settings'];
|
||||||
$symbolicLinks = $settingTableRows['symbolic_links'];
|
$symbolicLinks = $settingTableRows['symbolic_links'];
|
||||||
$fails = $settingTableRows['fails'];
|
$fails = $settingTableRows['fails'];
|
||||||
$mysqlInfo = $this->update->getMysqlVersionInfo();
|
$mysqlInfo = $this->update->getMysqlVersionInfo();
|
||||||
@@ -147,9 +135,9 @@ class NexusUpdate extends Command
|
|||||||
$this->update->createSymbolicLinks($symbolicLinks);
|
$this->update->createSymbolicLinks($symbolicLinks);
|
||||||
$this->doLog("createSymbolicLinks done!");
|
$this->doLog("createSymbolicLinks done!");
|
||||||
|
|
||||||
$this->doLog("going to saveSettings...");
|
// $this->doLog("going to saveSettings...");
|
||||||
$this->update->saveSettings($settings);
|
// $this->update->saveSettings($settings);
|
||||||
$this->doLog("saveSettings done!");
|
// $this->doLog("saveSettings done!");
|
||||||
|
|
||||||
$this->doLog("going to runExtraQueries...");
|
$this->doLog("going to runExtraQueries...");
|
||||||
$this->update->runExtraQueries();
|
$this->update->runExtraQueries();
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ if ($currentStep == 3) {
|
|||||||
|
|
||||||
if ($currentStep == 4) {
|
if ($currentStep == 4) {
|
||||||
$settingTableRows = $update->listSettingTableRows();
|
$settingTableRows = $update->listSettingTableRows();
|
||||||
$settings = $settingTableRows['settings'];
|
// $settings = $settingTableRows['settings'];
|
||||||
$symbolicLinks = $settingTableRows['symbolic_links'];
|
$symbolicLinks = $settingTableRows['symbolic_links'];
|
||||||
$tableRows = $settingTableRows['table_rows'];
|
$tableRows = $settingTableRows['table_rows'];
|
||||||
$pass = $settingTableRows['pass'];
|
$pass = $settingTableRows['pass'];
|
||||||
@@ -163,7 +163,8 @@ if ($currentStep == 4) {
|
|||||||
try {
|
try {
|
||||||
// $update->updateDependencies();
|
// $update->updateDependencies();
|
||||||
$update->createSymbolicLinks($symbolicLinks);
|
$update->createSymbolicLinks($symbolicLinks);
|
||||||
$update->saveSettings($settings);
|
//new setting should add in extraQueries(), this step only do when install
|
||||||
|
// $update->saveSettings($settings);
|
||||||
$update->runExtraQueries();
|
$update->runExtraQueries();
|
||||||
$update->runMigrate();
|
$update->runMigrate();
|
||||||
$update->runExtraMigrate();
|
$update->runExtraMigrate();
|
||||||
|
|||||||
Reference in New Issue
Block a user