mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add repair step to remove .step file after update 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2016-09-23 13:38:37 +02:00
parent 680e5cae5d
commit 038a03540f
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
2 changed files with 82 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Repair.php
View File

@ -35,6 +35,7 @@ use OC\Repair\AvatarPermissions;
use OC\Repair\CleanTags; use OC\Repair\CleanTags;
use OC\Repair\Collation; use OC\Repair\Collation;
use OC\Repair\DropOldJobs; use OC\Repair\DropOldJobs;
use OC\Repair\MoveUpdaterStepFile;
use OC\Repair\OldGroupMembershipShares; use OC\Repair\OldGroupMembershipShares;
use OC\Repair\RemoveGetETagEntries; use OC\Repair\RemoveGetETagEntries;
use OC\Repair\RemoveOldShares; use OC\Repair\RemoveOldShares;
@ -147,6 +148,7 @@ class Repair implements IOutput{
\OC::$server->getUserManager(), \OC::$server->getUserManager(),
\OC::$server->getGroupManager() \OC::$server->getGroupManager()
), ),
new MoveUpdaterStepFile(\OC::$server->getConfig()),
]; ];
} }

80
lib/private/Repair/MoveUpdaterStepFile.php Normal file
View File

@ -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');
}
}
}
}