viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extension installation improvements

Browse Source
This commit is contained in:
Taras Machyshyn
2018-03-20 12:29:36 +02:00
parent 0daeed49c1
commit b0bd0664f9
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
application/Espo/Core/Upgrades/Actions/Base/Install.php
View File

@@ -73,7 +73,9 @@ class Install extends \Espo\Core\Upgrades\Actions\Base
}
/* run before install script */
$this->runScript('before');
if (!isset($data['skipBeforeScript']) || !$data['skipBeforeScript']) {
$this->runScript('before');
}
/* remove files defined in a manifest "deleteBeforeCopy" */
$this->deleteFiles('deleteBeforeCopy', true);
@@ -89,8 +91,10 @@ class Install extends \Espo\Core\Upgrades\Actions\Base
$this->deleteFiles('vendor');
$this->copyFiles('vendor');
if (!$this->systemRebuild()) {
$this->throwErrorAndRemovePackage('Error occurred while EspoCRM rebuild.');
if (!isset($data['skipSystemRebuild']) || !$data['skipSystemRebuild']) {
if (!$this->systemRebuild()) {
$this->throwErrorAndRemovePackage('Error occurred while EspoCRM rebuild.');
}
}
//afterInstallFiles
@@ -99,7 +103,9 @@ class Install extends \Espo\Core\Upgrades\Actions\Base
}
/* run before install script */
$this->runScript('after');
if (!isset($data['skipAfterScript']) || !$data['skipAfterScript']) {
$this->runScript('after');
}
$this->afterRunAction();

10
application/Espo/Core/Upgrades/Actions/Base/Uninstall.php
View File

@@ -53,7 +53,7 @@ class Uninstall extends \Espo\Core\Upgrades\Actions\Base
$this->beforeRunAction();
/* run before install script */
if (!isset($data['isNotRunScriptBefore']) || !$data['isNotRunScriptBefore']) {
if (!isset($data['skipBeforeScript']) || !$data['skipBeforeScript']) {
$this->runScript('beforeUninstall');
}
@@ -71,12 +71,14 @@ class Uninstall extends \Espo\Core\Upgrades\Actions\Base
}
}
if (!$this->systemRebuild()) {
$this->throwErrorAndRemovePackage('Error occurred while EspoCRM rebuild.');
if (!isset($data['skipSystemRebuild']) || !$data['skipSystemRebuild']) {
if (!$this->systemRebuild()) {
$this->throwErrorAndRemovePackage('Error occurred while EspoCRM rebuild.');
}
}
/* run after uninstall script */
if (!isset($data['isNotRunScriptAfter']) || !$data['isNotRunScriptAfter']) {
if (!isset($data['skipAfterScript']) || !$data['skipAfterScript']) {
$this->runScript('afterUninstall');
}

3
application/Espo/Core/Upgrades/Actions/Extension/Install.php
View File

@@ -199,7 +199,8 @@ class Install extends \Espo\Core\Upgrades\Actions\Base\Install
$this->executeAction(ExtensionManager::UNINSTALL, array(
'id' => $extensionEntity->get('id'),
'isNotRunScriptAfter' => true,
'skipSystemRebuild' => true,
'skipAfterScript' => true,
)
);
}