From bd5822ea0aa7c6b520697198f5289cdfc5124582 Mon Sep 17 00:00:00 2001 From: Marcel Hernandez Date: Fri, 27 Nov 2015 12:46:49 +0100 Subject: [PATCH] [FIX] Fix linked folder creation --- Mage/Task/BuiltIn/Filesystem/LinkSharedFilesTask.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Mage/Task/BuiltIn/Filesystem/LinkSharedFilesTask.php b/Mage/Task/BuiltIn/Filesystem/LinkSharedFilesTask.php index e7010cb..a84d6c8 100644 --- a/Mage/Task/BuiltIn/Filesystem/LinkSharedFilesTask.php +++ b/Mage/Task/BuiltIn/Filesystem/LinkSharedFilesTask.php @@ -61,10 +61,9 @@ class LinkSharedFilesTask extends AbstractTask implements IsReleaseAware */ public function run() { - $linkedEntities = array_merge( - $this->getParameter(self::LINKED_FILES, array()), - $this->getParameter(self::LINKED_FOLDERS, array()) - ); + $linkedFiles = $this->getParameter(self::LINKED_FILES, array()); + $linkedFolders = $this->getParameter(self::LINKED_FOLDERS, array()); + $linkedEntities = array_merge($linkedFiles, $linkedFolders); if (empty($linkedEntities)) { throw new SkipException('No files and folders configured for sym-linking.'); @@ -83,7 +82,7 @@ class LinkSharedFilesTask extends AbstractTask implements IsReleaseAware } else { $target = $sharedFolderPath . '/' . $entityPath; } - $command = 'mkdir -p ' . escapeshellarg(dirname($target)); + $command = 'mkdir -p ' . escapeshellarg(in_array($ePath, $linkedFolders) ? $target : dirname($target)); $this->runCommandRemote($command); $command = 'ln -nfs ' . escapeshellarg($target) . ' ' . escapeshellarg($currentCopy . '/' . $entityPath); $this->runCommandRemote($command);