Projects / CakeMate

diff --git a/vendors/shells/tasks/base.php b/vendors/shells/tasks/base.php index c845a45..5fdd15a 100644 --- a/vendors/shells/tasks/base.php +++ b/vendors/shells/tasks/base.php @@ -54,9 +54,8 @@ class BaseTask extends Shell { 'base' => null, 'baseType' => 'app', 'signatureFiles' => array( - 'branch' => 'DS..DS..DSbranches', 'repo' => 'DS.gitDSHEAD', - 'app' => 'DSconfigDSroutes.php', + 'app' => 'DSconfigDSbootstrap.php', 'cake' => 'DScakeDSbasics.php', ), ); @@ -130,14 +129,14 @@ class BaseTask extends Shell { $path = $this->path(); } $base = null; - foreach ($this->settings['signatureFiles'] as $type => $signatureFile) { - $_path = $path; - while (empty($base) && $_path !== dirname($_path)) { + $_path = $path; + while (empty($base) && $_path !== dirname($_path)) { + foreach ($this->settings['signatureFiles'] as $type => $signatureFile) { if (file_exists($_path . $signatureFile)) { $base = $_path; } - $_path = dirname($_path); } + $_path = dirname($_path); if ($base) { break; } diff --git a/vendors/vim/plugins/cakephp.vim b/vendors/vim/plugins/cakephp.vim index cd88d8d..9887d72 100644 --- a/vendors/vim/plugins/cakephp.vim +++ b/vendors/vim/plugins/cakephp.vim @@ -216,10 +216,10 @@ function s:SetupBuffer() let l:Root = split(substitute(system(cmd), s:junk, '', 'g'), '\n') silent! let [b:Root; rest] = l:Root if !has_key(s:Projects, b:Root) - let s:Projects[b:Root] = b:Root - let cmd = '!cd ' . shellescape(b:Root) . ' && nice cake autopilot -q -noclear >auto.log 2>auto.err &' + let cmd = '!cd ' . shellescape(b:Root) . ' && nice -n20 cake autopilot -q -noclear >auto.log 2>auto.err &' let s:ConsoleLog = s:ConsoleLog + [cmd] :silent exe cmd + let s:Projects[b:Root] = system('$!') endif silent! :exe "set tags=" . b:Root . "/tags," . s:Cake . "/tags" endif