Slim down SymlinkStorageTask and let the public/storage symlink be ge…

…nerated by its own Task
TYPO3 · Jun 29, 2020 · 84722f9 · 84722f9
1 parent 2546bc9
commit 84722f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 20 deletions.
diff --git a/src/Application/Laravel.php b/src/Application/Laravel.php
@@ -32,9 +32,6 @@ public function __construct($name = 'Laravel')
         parent::__construct($name);
         $this->options = array_merge($this->options, [
             'webDirectory' => 'public',
-            'directories' => [
-                'storage'
-            ],
             'rsyncExcludes' => [
                 '.git',
                 '*.example',

diff --git a/src/Task/Laravel/SymlinkStorageTask.php b/src/Task/Laravel/SymlinkStorageTask.php
@@ -48,27 +48,13 @@ public function execute(Node $node, Application $application, Deployment $deploy
         $applicationReleasePath = $deployment->getApplicationReleasePath($application);
         $diffPath = substr($applicationReleasePath, strlen($deploymentPath));
 
-        $webDirectory = isset($options['webDirectory']) ? trim($options['webDirectory'], '\\/') : '';
-        $relativeDataPath = $relativeDataPathFromWeb = str_repeat('../', substr_count(trim($diffPath, '/'), '/') + 1) . 'shared';
-        if ($webDirectory !== '') {
-            $relativeDataPathFromWeb = str_repeat('../', substr_count(trim($webDirectory, '/'), '/') + 1) . $relativeDataPath;
-        }
-        $absoluteWebDirectory = rtrim("$targetReleasePath/$webDirectory", '/');
+        $relativeDataPath = str_repeat('../', substr_count(trim($diffPath, '/'), '/') + 1) . 'shared';
+        $absoluteProjectRootDirectory = rtrim($targetReleasePath, '/');
         $commands = [
             'cd ' . escapeshellarg($targetReleasePath),
             sprintf('{ [ -d %1$s ] || mkdir -p %1$s ; }', escapeshellarg("{$relativeDataPath}/storage")),
-            sprintf('ln -sf %1$s %2$s', escapeshellarg("{$relativeDataPathFromWeb}/storage"), escapeshellarg("{$absoluteWebDirectory}/storage"))
+            sprintf('ln -sf %1$s %2$s', escapeshellarg("{$relativeDataPath}/storage"), escapeshellarg("{$absoluteProjectRootDirectory}/storage"))
         ];
-        if (isset($options['directories']) && is_array($options['directories'])) {
-            foreach ($options['directories'] as $directory) {
-                $directory = trim($directory, '\\/');
-                $targetDirectory = Files::concatenatePaths([$relativeDataPath, $directory]);
-                $commands[] = sprintf('{ [ -d %1$s ] || mkdir -p %1$s ; }', escapeshellarg($targetDirectory));
-                $commands[] = 'ln -sf ' . escapeshellarg(
-                        str_repeat('../', substr_count(trim($directory, '/'), '/')) . $targetDirectory
-                    ) . ' ' . escapeshellarg($directory);
-            }
-        }
         $this->shell->executeOrSimulate($commands, $node, $deployment);
     }