Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-06-16 03:40:53 +02:00
Code Issues Packages Projects Releases Activity

latest tweak

Browse Source 
Signed-off-by: Andy Miller <rhuk@mac.com>
This commit is contained in:
Andy Miller
2025-10-15 12:42:38 -06:00
parent 57212ec9a5
commit 43ddf45057
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
system/src/Grav/Common/Upgrade/SafeUpgradeService.php
View File

@@ -74,7 +74,7 @@ class SafeUpgradeService
$root = $options['root'] ?? GRAV_ROOT;
$this->rootPath = rtrim($root, DIRECTORY_SEPARATOR);
$this->parentDir = $options['parent_dir'] ?? dirname($this->rootPath);
$this->stagingRoot = $options['staging_root'] ?? ($this->parentDir . DIRECTORY_SEPARATOR . 'grav-upgrades');
$this->stagingRoot = $options['staging_root'] ?? ($this->rootPath . DIRECTORY_SEPARATOR . 'grav-upgrades');
$this->manifestStore = $options['manifest_store'] ?? ($this->rootPath . DIRECTORY_SEPARATOR . 'user' . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'upgrades');
if (isset($options['ignored_dirs']) && is_array($options['ignored_dirs'])) {
$this->ignoredDirs = $options['ignored_dirs'];
@@ -135,6 +135,7 @@ class SafeUpgradeService
$packagePath = $stagePath . DIRECTORY_SEPARATOR . 'package';
$backupPath = $this->stagingRoot . DIRECTORY_SEPARATOR . 'rollback-' . $stageId;
Folder::create($this->stagingRoot);
Folder::create($packagePath);
// Copy extracted package into staging area.
@@ -179,6 +180,7 @@ class SafeUpgradeService
$rotated = $this->rotateCurrentTree();
$this->promoteBackup($backupPath);
$this->syncGitDirectory($rotated, $this->rootPath);
$this->markRollback($manifest['id']);
if ($rotated && is_dir($rotated)) {
Folder::delete($rotated);
@@ -420,6 +422,8 @@ class SafeUpgradeService
rename($backupPath, $liveRoot);
throw new RuntimeException('Failed to promote staged Grav release.');
}
$this->syncGitDirectory($backupPath, $liveRoot);
}
/**