mirror of
				https://github.com/hauke68/Magallanes.git
				synced 2025-11-04 00:50:18 +01:00 
			
		
		
		
	Tweaks.
This commit is contained in:
		
							parent
							
								
									ec2bb12bf4
								
							
						
					
					
						commit
						724fc05b9e
					
				@ -350,6 +350,7 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
 | 
			
		||||
            if (self::$deployStatus == self::SUCCEDED && $this->getConfig()->release('enabled', false) == true) {
 | 
			
		||||
                // Execute the Releases
 | 
			
		||||
                Console::output('Starting the <dark_gray>Releasing</dark_gray>');
 | 
			
		||||
                $completedTasks = 0;
 | 
			
		||||
                foreach ($hosts as $hostKey => $host) {
 | 
			
		||||
 | 
			
		||||
                    // Check if Host has specific configuration
 | 
			
		||||
 | 
			
		||||
@ -28,6 +28,7 @@ class ReleasesCommand extends AbstractCommand implements RequiresEnvironment
 | 
			
		||||
     */
 | 
			
		||||
    public function run()
 | 
			
		||||
    {
 | 
			
		||||
        $result = false;
 | 
			
		||||
        $subCommand = $this->getConfig()->getArgument(1);
 | 
			
		||||
 | 
			
		||||
        // Run Tasks for Deployment
 | 
			
		||||
 | 
			
		||||
@ -28,14 +28,16 @@ class RollbackCommand extends AbstractCommand implements RequiresEnvironment
 | 
			
		||||
     */
 | 
			
		||||
    public function run()
 | 
			
		||||
    {
 | 
			
		||||
        $result = false;
 | 
			
		||||
        $releaseId = $this->getConfig()->getArgument(1);
 | 
			
		||||
 | 
			
		||||
        if (!is_numeric($releaseId)) {
 | 
			
		||||
            Console::output('<red>This release is mandatory.</red>', 1, 2);
 | 
			
		||||
            return false;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        $lockFile = getcwd() . '/.mage/' . $this->getConfig()->getEnvironment() . '.lock';
 | 
			
		||||
        if (file_exists($lockFile) && ($subcommand == 'rollback')) {
 | 
			
		||||
        if (file_exists($lockFile)) {
 | 
			
		||||
            Console::output('<red>This environment is locked!</red>', 1, 2);
 | 
			
		||||
            echo file_get_contents($lockFile);
 | 
			
		||||
            return null;
 | 
			
		||||
 | 
			
		||||
@ -85,11 +85,10 @@ class Console
 | 
			
		||||
            }
 | 
			
		||||
        });
 | 
			
		||||
 | 
			
		||||
        // Load configuration
 | 
			
		||||
        $config = self::$config = new Config;
 | 
			
		||||
        $configError = false;
 | 
			
		||||
        try {
 | 
			
		||||
            // Load Config
 | 
			
		||||
            $config = self::$config = new Config;
 | 
			
		||||
            // Load configuration
 | 
			
		||||
            $config->load($arguments);
 | 
			
		||||
 | 
			
		||||
        } catch (Exception $exception) {
 | 
			
		||||
@ -249,7 +248,6 @@ class Console
 | 
			
		||||
    public static function readInput()
 | 
			
		||||
    {
 | 
			
		||||
        $fp = fopen("php://stdin", "r");
 | 
			
		||||
        $line = '';
 | 
			
		||||
        $line = fgets($fp);
 | 
			
		||||
 | 
			
		||||
        return rtrim($line);
 | 
			
		||||
 | 
			
		||||
@ -36,6 +36,7 @@ class ReleaseTask extends AbstractTask implements IsReleaseAware, SkipOnOverride
 | 
			
		||||
     */
 | 
			
		||||
    public function run()
 | 
			
		||||
    {
 | 
			
		||||
        $resultFetch = false;
 | 
			
		||||
        if ($this->getConfig()->release('enabled', false) == true) {
 | 
			
		||||
            $releasesDirectory = $this->getConfig()->release('directory', 'releases');
 | 
			
		||||
            $symlink = $this->getConfig()->release('symlink', 'current');
 | 
			
		||||
 | 
			
		||||
@ -95,7 +95,7 @@ abstract class BaseStrategyTaskAbstract extends AbstractTask implements IsReleas
 | 
			
		||||
                            $directoryToDelete = $releasesDirectory . '/' . $releaseIdToDelete;
 | 
			
		||||
                            if ($directoryToDelete != '/') {
 | 
			
		||||
                                $command = 'rm -rf ' . $directoryToDelete;
 | 
			
		||||
                                $result = $result && $this->runCommandRemote($command);
 | 
			
		||||
                                $this->runCommandRemote($command);
 | 
			
		||||
                            }
 | 
			
		||||
                        }
 | 
			
		||||
                    }
 | 
			
		||||
 | 
			
		||||
@ -480,6 +480,7 @@ class Parser
 | 
			
		||||
                if ($isCurrentLineBlank) {
 | 
			
		||||
                    $text .= substr($this->currentLine, $indentation);
 | 
			
		||||
                } else {
 | 
			
		||||
                    /** @noinspection PhpUndefinedVariableInspection */
 | 
			
		||||
                    $text .= $matches[1];
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user