Permalink
Browse files

Moving the clear command into the shell dispatcher

  • Loading branch information...
1 parent b2142df commit ae74dca1a56fb3b396e8113e2cbcfa5ca8861fc0 @AD7six AD7six committed Jul 24, 2009
Showing with 18 additions and 2 deletions.
  1. +0 −2 cake/console/cake
  2. +17 −0 cake/console/cake.php
  3. +1 −0 cake/console/libs/shell.php
View
@@ -22,8 +22,6 @@
# @license http://www.opensource.org/licenses/mit-license.php The MIT License
#
################################################################################
-clear
-
LIB=${0/%cake/}
APP=`pwd`
View
@@ -287,6 +287,22 @@ function __bootstrap() {
}
/**
+ * 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
*
* @access public
@@ -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:");
@@ -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']);

0 comments on commit ae74dca

Please sign in to comment.