Merge pull request #49 from bestit-dfuchs/feature/env-console-script-…

…path added console_script_path option to environment config
bestit · Jan 2, 2019 · ec6fb27 · ec6fb27
2 parents 65f7077 + 15f2c6e
commit ec6fb27
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -24,6 +24,8 @@ magephp:
             releases: 4
             # Add php_executable in environment options to overwrite the global configuration above
             php_executable: /usr/bin/env/path/to/php
+            # Add console_script_path in environment options to overwrite the default ./bin/console
+            console_script_path: ./bin/console
             hosts:
                 - production_server1
             pre-deploy:

diff --git a/src/Shopware/AbstractTask.php b/src/Shopware/AbstractTask.php
@@ -31,4 +31,26 @@ protected function getPathToPhpExecutable()
 
         return $phpExecutable;
     }
+
+    /**
+     * Returns the console script path if configured, otherwise ./bin/console as default value.
+     *
+     * @return string The configured or default console script path.
+     */
+    protected function getPathToConsoleScript()
+    {
+        $consoleScriptPath = './bin/console';
+
+        $environmentConsoleScriptPath = $this->runtime->getEnvOption('console_script_path');
+
+        if ($environmentConsoleScriptPath !== null) {
+            $consoleScriptPath = $environmentConsoleScriptPath;
+        }
+
+        if ($this->runtime->getReleaseId() !== null) {
+            $consoleScriptPath = str_replace('%release%', $this->runtime->getReleaseId(), $consoleScriptPath);
+        }
+
+        return $consoleScriptPath;
+    }
 }
diff --git a/src/Shopware/AbstractUpdatePluginsTask.php b/src/Shopware/AbstractUpdatePluginsTask.php
@@ -53,8 +53,9 @@ protected function updateAllInDir($directory)
             }
 
             $cmd = sprintf(
-                '%s ./bin/console sw:plugin:update %s',
+                '%s %s sw:plugin:update %s',
                 $this->getPathToPhpExecutable(),
+                $this->getPathToConsoleScript(),
                 $file->getFilename()
             );
 
@@ -78,7 +79,11 @@ protected function updateAllInDir($directory)
      */
     protected function refreshPluginList()
     {
-        $cmd = sprintf('%s ./bin/console sw:plugin:refresh', $this->getPathToPhpExecutable());
+        $cmd = sprintf(
+            '%s %s sw:plugin:refresh',
+            $this->getPathToPhpExecutable(),
+            $this->getPathToConsoleScript()
+        );
         $process = $this->runtime->runRemoteCommand($cmd, true);
 
         if (!$process->isSuccessful()) {

diff --git a/src/Shopware/CommandTask.php b/src/Shopware/CommandTask.php
@@ -50,8 +50,9 @@ public function execute()
         }
 
         $cmd = sprintf(
-            '%s ./bin/console %s %s',
+            '%s %s %s %s',
             $this->getPathToPhpExecutable(),
+            $this->getPathToConsoleScript(),
             $this->getCommand(),
             $this->options['flags']
         );