Adding Shel::$command back in as it was still being used, oops.

Updating Bakeshell to do its tricks at the correct time.
cakephp · Oct 18, 2010 · 8f0a96d · 8f0a96d
1 parent 561067e
commit 8f0a96d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/cake/console/shells/bake.php b/cake/console/shells/bake.php
@@ -43,8 +43,8 @@ class BakeShell extends Shell {
  * Override loadTasks() to handle paths
  *
  */
-	public function loadTasks() {
-		parent::loadTasks();
+	public function startup() {
+		parent::startup();
 		$task = Inflector::classify($this->command);
 		if (isset($this->{$task}) && !in_array($task, array('Project', 'DbConfig'))) {
 			if (isset($this->params['connection'])) {
@@ -188,7 +188,7 @@ public function all() {
 			$this->out(__('Bake All complete'));
 			array_shift($this->args);
 		} else {
-			$this->err(__('Bake All could not continue without a valid model'));
+			$this->error(__('Bake All could not continue without a valid model'));
 		}
 		$this->_stop();
 	}

diff --git a/cake/console/shells/shell.php b/cake/console/shells/shell.php
@@ -68,6 +68,13 @@ class Shell extends Object {
  */
 	public $params = array();
 
+/**
+ * The command (method/task) that is being run.
+ *
+ * @var string
+ */
+	public $command;
+
 /**
  * Contains arguments parsed from the command line.
  *