mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-16 18:31:26 +01:00
also ignoring empty lines and adding to svn cp --parent -m "creating $svntag"
This commit is contained in:
parent
a2f59c855b
commit
634e44873b
@ -459,8 +459,9 @@ function do_svntag()
|
|||||||
$config['modules'] = array();
|
$config['modules'] = array();
|
||||||
foreach($output as $line)
|
foreach($output as $line)
|
||||||
{
|
{
|
||||||
if ($line[0] == '#') continue;
|
$line = trim($line);
|
||||||
list($path,$url) = preg_split('/[ \t\r\n]+/',trim($line));
|
if (empty($line) || $line[0] == '#') continue;
|
||||||
|
list($path,$url) = preg_split('/[ \t\r\n]+/',$line);
|
||||||
if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die("Invalid SVN URL: $url\n");
|
if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die("Invalid SVN URL: $url\n");
|
||||||
$repo = $matches[1];
|
$repo = $matches[1];
|
||||||
$config['modules'][$repo][$path] = $url;
|
$config['modules'][$repo][$path] = $url;
|
||||||
@ -483,7 +484,7 @@ function do_svntag()
|
|||||||
foreach($config['modules'] as $repo => $modules)
|
foreach($config['modules'] as $repo => $modules)
|
||||||
{
|
{
|
||||||
if ($repo == 'http://svn.egroupware.org/egroupware') $repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
|
if ($repo == 'http://svn.egroupware.org/egroupware') $repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
|
||||||
$cmd = $svn.' cp '.implode(' ',$modules).' '.$repo.'/'.$config['svntag'].'/';
|
$cmd = $svn.' cp --parents -m '.escapeshellarg('Creating '.$config['svntag']).' '.implode(' ',$modules).' '.$repo.'/'.$config['svntag'].'/';
|
||||||
run_cmd($cmd);
|
run_cmd($cmd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user