mirror_php/deployer
1
0
Fork 0
mirror of https://github.com/deployphp/deployer.git synced 2025-02-24 01:02:24 +01:00
Code Issues Projects Releases Wiki Activity

Parse the target path given to cd to prevent recursive loop.

Browse Source 
If cd was given {release_path} as target path, it would attempt to run a command to figure out what the value of {release_path} is, which, in the process, would also want to know the value of {release_path} and so on.

The fix simply parses the value as it is given, thus making the result static instead of a closure.
This commit is contained in:
Tom Rochette 2015-02-25 12:46:52 -05:00
parent 2ee23ada16
commit f3443a7615
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
recipe/common.php
View File

@ -105,9 +105,9 @@ task('deploy:update_code', function () {
} else if (!empty($branch)) {
$at = "-b $branch";
}
run("git clone $at --depth 1 --recursive -q $repository {release_path} 2>&1");
})->desc('Updating code');
@ -155,14 +155,14 @@ task('deploy:writable', function () {
$httpUser = run("ps aux | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\ -f1")->toString();
cd(env('release_path'));
cd('{release_path}');
if (strpos(run("chmod 2>&1; true"), '+a') !== false) {
if (!empty($httpUser)) {
run("$sudo chmod +a \"$httpUser allow delete,write,append,file_inherit,directory_inherit\" $dirs");
}
run("$sudo chmod +a \"`whoami` allow delete,write,append,file_inherit,directory_inherit\" $dirs");
} elseif (commandExist('setfacl')) {
@ -171,7 +171,7 @@ task('deploy:writable', function () {
run("$sudo setfacl -R -m u:\"$httpUser\":rwX -m u:`whoami`:rwX $dirs");
run("$sudo setfacl -dR -m u:\"$httpUser\":rwX -m u:`whoami`:rwX $dirs");
} else {
run("$sudo chmod 777 $dirs");
run("$sudo chmod 777 $dirs");
}

2
src/functions.php
View File

@ -173,7 +173,7 @@ function option($name, $shortcut = null, $mode = null, $description = '', $defau
*/
function cd($path)
{
env('working_path', $path);
env('working_path', env()->parse($path));
}
/**