Add repair step to remove .step file after update
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
parent
680e5cae5d
commit
038a03540f
|
@ -35,6 +35,7 @@ use OC\Repair\AvatarPermissions;
|
|||
use OC\Repair\CleanTags;
|
||||
use OC\Repair\Collation;
|
||||
use OC\Repair\DropOldJobs;
|
||||
use OC\Repair\MoveUpdaterStepFile;
|
||||
use OC\Repair\OldGroupMembershipShares;
|
||||
use OC\Repair\RemoveGetETagEntries;
|
||||
use OC\Repair\RemoveOldShares;
|
||||
|
@ -147,6 +148,7 @@ class Repair implements IOutput{
|
|||
\OC::$server->getUserManager(),
|
||||
\OC::$server->getGroupManager()
|
||||
),
|
||||
new MoveUpdaterStepFile(\OC::$server->getConfig()),
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,80 @@
|
|||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c) 2016 Morris Jobke <hey@morrisjobke.de>
|
||||
*
|
||||
* @author Morris Jobke <hey@morrisjobke.de>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OC\Repair;
|
||||
|
||||
use OCP\Migration\IOutput;
|
||||
use OCP\Migration\IRepairStep;
|
||||
|
||||
class MoveUpdaterStepFile implements IRepairStep {
|
||||
|
||||
/** @var \OCP\IConfig */
|
||||
protected $config;
|
||||
|
||||
/**
|
||||
* @param \OCP\IConfig $config
|
||||
*/
|
||||
public function __construct($config) {
|
||||
$this->config = $config;
|
||||
}
|
||||
|
||||
public function getName() {
|
||||
return 'Move .step file of updater to backup location';
|
||||
}
|
||||
|
||||
public function run(IOutput $output) {
|
||||
|
||||
$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT);
|
||||
$instanceId = $this->config->getSystemValue('instanceid', null);
|
||||
|
||||
if(!is_string($instanceId) || empty($instanceId)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$updaterFolderPath = $dataDir . '/updater-' . $instanceId;
|
||||
$stepFile = $updaterFolderPath . '/.step';
|
||||
if(file_exists($stepFile)) {
|
||||
$output->info('.step file exists');
|
||||
|
||||
$previousStepFile = $updaterFolderPath . '/.step-previous-update';
|
||||
|
||||
// cleanup
|
||||
if(file_exists($previousStepFile)) {
|
||||
if(\OC_Helper::rmdirr($previousStepFile)) {
|
||||
$output->info('.step-previous-update removed');
|
||||
} else {
|
||||
$output->info('.step-previous-update can\'t be removed - abort move of .step file');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// move step file
|
||||
if(rename($stepFile, $previousStepFile)) {
|
||||
$output->info('.step file moved to .step-previous-update');
|
||||
} else {
|
||||
$output->warning('.step file can\'t be moved');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue