Moving the clear command into the shell dispatcher

cakephp · Jul 24, 2009 · ae74dca · ae74dca
1 parent b2142df
commit ae74dca
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/cake/console/cake b/cake/console/cake
@@ -22,8 +22,6 @@
 # @license			http://www.opensource.org/licenses/mit-license.php The MIT License
 #
 ################################################################################
-clear
-
 LIB=${0/%cake/}
 APP=`pwd`
 

diff --git a/cake/console/cake.php b/cake/console/cake.php
@@ -286,6 +286,22 @@ function __bootstrap() {
 		return true;
 	}
 
+/**
+ * Clear the console
+ *
+ * @return void
+ * @access public
+ */
+	function clear() {
+		if (empty($this->params['noclear'])) {
+			if ( DS === '/') {
+				passthru('clear');
+			} else {
+				passthru('cls');
+			}
+		}
+	}
+
 /**
  * Dispatches a CLI request
  *
@@ -557,6 +573,7 @@ function shiftArgs() {
  * @access public
  */
 	function help() {
+		$this->clear();
 		$this->stdout("\nWelcome to CakePHP v" . Configure::version() . " Console");
 		$this->stdout("---------------------------------------------------------------");
 		$this->stdout("Current Paths:");

diff --git a/cake/console/libs/shell.php b/cake/console/libs/shell.php
@@ -204,6 +204,7 @@ function startup() {
  * @access protected
  */
 	function _welcome() {
+		$this->Dispatcher->clear();
 		$this->out("\nWelcome to CakePHP v" . Configure::version() . " Console");
 		$this->out("---------------------------------------------------------------");
 		$this->out('App : '. $this->params['app']);