Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Quote path in awk command for Windows compatibility [MAILPOET-758]

Browse Source
This commit is contained in:
Alexey Stoletniy
2016-12-22 10:16:15 +03:00
parent fc53aca31d
commit e255484bc8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
RoboFile.php
View File

@@ -249,7 +249,9 @@ class RoboFile extends \Robo\Tasks {
->remove("$svn_dir/trunk_old") ->remove("$svn_dir/trunk_old")
->addToCollection($collection); ->addToCollection($collection);
// Mac OS X compatibility issue // Windows compatibility
$awkCmd = '{print " --force \""$2"\""}';
// Mac OS X compatibility
$xargsFlag = (stripos(PHP_OS, 'Darwin') !== false) ? '' : '-r'; $xargsFlag = (stripos(PHP_OS, 'Darwin') !== false) ? '' : '-r';
$this->taskExecStack() $this->taskExecStack()
@@ -257,7 +259,7 @@ class RoboFile extends \Robo\Tasks {
// Set SVN repo as working directory // Set SVN repo as working directory
->dir($svn_dir) ->dir($svn_dir)
// Remove files from SVN repo that have already been removed locally // Remove files from SVN repo that have already been removed locally
->exec("svn st | grep ^! | awk '{print \" --force \"$2}' | xargs " . $xargsFlag . " svn rm") ->exec("svn st | grep ^! | awk '$awkCmd' | xargs $xargsFlag svn rm")
// Recursively add files to SVN that haven't been added yet // Recursively add files to SVN that haven't been added yet
->exec("svn add --force * --auto-props --parents --depth infinity -q") ->exec("svn add --force * --auto-props --parents --depth infinity -q")
// Tag the release // Tag the release