Merge pull request #18 from xel1045/master

[Fix #2 #15] Allow to specify the config file location & A macro should stop if one of its task fails
eXolnet · Sep 25, 2015 · e60dba0 · e60dba0
2 parents e511bdc + 2b8a24a
commit e60dba0
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Envoy.blade.php b/Envoy.blade.php
@@ -1,9 +1,9 @@
 @setup
-	$baseCwd      = isset($__current_cwd) ? $__current_cwd : getcwd();
-	$configFile   = $baseCwd.'/app/config/deploy.php';
+	$baseCwd    = isset($__current_cwd) ? $__current_cwd : getcwd();
+	$configFile = $baseCwd .'/'. (isset($configFile) ? $configFile : 'app/config/deploy.php');
 
 	if ( ! file_exists($configFile)) {
-		throw new Exception('Config file app/config/deploy.php not found.');
+		throw new Exception('Config file '. $configFile .' not found.');
 	}
 
 	$deployConfig = include($configFile);
@@ -282,6 +282,8 @@
 @error
 	if ($task === 'deploy:check') {
 		throw new Exception('Unmet prerequisites to deploy. Have you run deploy:setup?');
+	} else {
+		throw new Exception('Whoops, looks like something went wrong');
 	}
 @enderror