Adding a protection to cake console be executed in driver root (windo…

…ws). Fixes #1408.
cakephp · Feb 21, 2011 · 21a9904 · Theaxiom · Apr 9, 2011 · ADmad
1 parent 0e7f2ef
commit 21a9904
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/cake/console/cake.bat b/cake/console/cake.bat
@@ -26,7 +26,7 @@
 SET app=%0
 SET lib=%~dp0
 
-php -q "%lib%cake.php" -working "%CD%" %*
+php -q "%lib%cake.php" -working "%CD% " %*
 
 echo.
 

diff --git a/cake/console/cake.php b/cake/console/cake.php
@@ -501,6 +501,9 @@ function parseParams($params) {
 		}
 		$params = str_replace('\\', '/', $params);
 
+		if (isset($params['working'])) {
+			$params['working'] = trim($params['working']);
+		}
 		if (!empty($params['working']) && (!isset($this->args[0]) || isset($this->args[0]) && $this->args[0]{0} !== '.')) {
 			if (empty($this->params['app']) && $params['working'] != $params['root']) {
 				$params['root'] = dirname($params['working']);
@@ -516,8 +519,10 @@ function parseParams($params) {
 			$params['root'] .= '/' . dirname($params['app']);
 		}
 
-		$params['app'] = basename($params['app']);
-		$params['working'] = rtrim($params['root'], '/') . '/' . $params['app'];
+		$params['working'] = rtrim($params['root'], '/');
+		if (!$isWin || !preg_match('/^[A-Z]:$/i', $params['app'])) {
+			$params['working'] .= '/' . $params['app'];
+		}
 
 		if (!empty($matches[0]) || !empty($isWin)) {
 			$params = str_replace('/', '\\', $params);