diff --git a/docs/recipe/shopware.md b/docs/recipe/shopware.md index f962aee4c..5564d6b8a 100644 --- a/docs/recipe/shopware.md +++ b/docs/recipe/shopware.md @@ -189,20 +189,6 @@ This task is group task which contains next tasks: -### sw-build-without-db:build -[Source](https://github.com/deployphp/deployer/blob/master/recipe/shopware.php#L166) - - - - - - -### sw-build-without-db -[Source](https://github.com/deployphp/deployer/blob/master/recipe/shopware.php#L170) - - - - This task is group task which contains next tasks: diff --git a/recipe/shopware.php b/recipe/shopware.php index 65387c73d..46f3a0ee8 100644 --- a/recipe/shopware.php +++ b/recipe/shopware.php @@ -158,8 +158,17 @@ function getPlugins(): array download('{{deploy_path}}/current/files/theme-config', './files/'); // Temporary workaround to remove absolute file paths in Shopware <6.4.6.0 - // See https://github.com/shopware/platform/commit/01c8ff86c7d8d3bee1888a26c24c9dc9b4529cbc and https://issues.shopware.com/issues/NEXT-17720 - runLocally('sed -i "" -E \'s/\\\\\/var\\\\\/www\\\\\/htdocs\\\\\/releases\\\\\/[0-9]+\\\\\///g\' files/theme-config/* || true'); + // See: + // - https://github.com/shopware/platform/commit/01c8ff86c7d8d3bee1888a26c24c9dc9b4529cbc + // - https://issues.shopware.com/issues/NEXT-17720 + // - https://github.com/deployphp/deployer/issues/2754 + $deployPath = get('deploy_path'); + if (substr($deployPath, -1, 1) !== '/') { + $deployPath .= '/'; + } + $deployPath .= 'releases/[0-9a-zA-Z]*/'; + $escapedDeployPath = str_replace('/', '\\\\/', $deployPath); + runLocally("sed -iE 's#${escapedDeployPath}##g' files/theme-config/* || true"); }); });