adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updating shell paths and help

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5099 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2007-05-15 01:16:10 +00:00
parent 033ced9d7a
commit 4c9a9ebb31
2 changed files with 24 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
cake/console/cake.php
View file

@ -237,7 +237,7 @@ class ShellDispatcher {
*/ */
function dispatch() { function dispatch() {
$this->stdout("\nWelcome to CakePHP v" . Configure::version() . " Console"); $this->stdout("\nWelcome to CakePHP v" . Configure::version() . " Console");
$this->stdout("---------------------------------------------------------------");
$protectedCommands = array('initialize', 'main','in','out','err','hr', $protectedCommands = array('initialize', 'main','in','out','err','hr',
'createFile', 'isDir','copyDir','Object','toString', 'createFile', 'isDir','copyDir','Object','toString',
'requestAction','log','cakeError', 'ShellDispatcher', 'requestAction','log','cakeError', 'ShellDispatcher',
@ -404,38 +404,29 @@ class ShellDispatcher {
$app = 'app'; $app = 'app';
$root = dirname(dirname(dirname(__FILE__))); $root = dirname(dirname(dirname(__FILE__)));
$working = dirname(dirname(dirname(__FILE__)));
if(!empty($this->params['working'])) { if(!empty($this->params['working'])) {
$root = dirname($this->params['working']);
$app = basename($this->params['working']); $app = basename($this->params['working']);
$working = dirname($this->params['working']) . DS . basename($this->params['working']);
$root = dirname($working);
unset($this->params['working']);
} }
if(!empty($this->params['app'])) { if(!empty($this->params['app'])) {
if($this->params['app']{0} == '/') { if($this->params['app']{0} == '/') {
$root = dirname($this->params['app']);
$app = basename($this->params['app']); $app = basename($this->params['app']);
$working = $this->params['app'];
} else { } else {
$root = $root . DS . $app;
$app = $this->params['app']; $app = $this->params['app'];
} }
unset($this->params['app']);
} }
if(empty($this->params['app']) && in_array($app, array('cake', 'console', 'app'))){
if(in_array($app, array('cake', 'console')) || realpath($root.DS.$app) === dirname(dirname(dirname(__FILE__)))) {
$root = dirname(dirname(dirname(__FILE__)));
$app = 'app'; $app = 'app';
$working = dirname(dirname(__FILE__));
} }
if($app !== basename($working) && realpath($working) !== dirname(dirname(__FILE__))) { $working = $root . DS . $app;
$root = $working;
}
if($app === basename($working) && realpath($working) === dirname(dirname(dirname(__FILE__)))) {
$app = 'app';
$root = $working;
}
$this->params = array_merge(array('app'=> $app, 'root'=> $root, 'working'=> $working), $this->params); $this->params = array_merge(array('app'=> $app, 'root'=> $root, 'working'=> $working), $this->params);
} }
@ -458,13 +449,18 @@ class ShellDispatcher {
* @return void * @return void
*/ */
function help() { function help() {
$this->stdout("\nPaths:"); $this->stdout("Current Paths:");
$this->stdout(" -working: " . $this->params['working']); $this->stdout(" -working: " . $this->params['working']);
$this->stdout(" -root: " . ROOT); $this->stdout(" -root: " . ROOT);
$this->stdout(" -app: ". APP); $this->stdout(" -app: ". APP);
$this->stdout(" -core: " . CORE_PATH); $this->stdout(" -core: " . CORE_PATH);
$this->stdout("");
$this->stdout("Changing Paths:");
$this->stdout("your working path should be the same as your application path");
$this->stdout("to change your path use the '-app' param.");
$this->stdout("Example: -app relative/path/to/myapp or -app /absolute/path/to/myapp");
$this->stdout("\nAvailable Scripts:"); $this->stdout("\nAvailable Shells:");
foreach($this->shellPaths as $path) { foreach($this->shellPaths as $path) {
if(is_dir($path)) { if(is_dir($path)) {
$shells = listClasses($path); $shells = listClasses($path);
@ -475,14 +471,14 @@ class ShellDispatcher {
} else { } else {
foreach ($shells as $shell) { foreach ($shells as $shell) {
if ($shell != 'shell.php') { if ($shell != 'shell.php') {
$this->stdout("\t - " . r('.php', '', $shell)); $this->stdout("\t " . r('.php', '', $shell));
} }
} }
} }
} }
} }
$this->stdout("\nTo run a command, type 'cake script_name [args]'"); $this->stdout("\nTo run a command, type 'cake shell_name [args]'");
$this->stdout("To get help on a specific command, type 'cake script_name help'"); $this->stdout("To get help on a specific command, type 'cake shell_name help'");
exit(); exit();
} }
} }

1
cake/console/libs/shell.php
View file

@ -143,7 +143,6 @@ class Shell extends Object {
* @return void * @return void
*/ */
function _welcome() { function _welcome() {
$this->hr();
$this->out('App : '. APP_DIR); $this->out('App : '. APP_DIR);
$this->out('Path: '. ROOT . DS . APP_DIR); $this->out('Path: '. ROOT . DS . APP_DIR);
$this->hr(); $this->hr();