EGroupware / egroupware

doc/rpm-build/checkout-build-archives.php

Braces +232 added lines, -57 removed lines

@@ -10,10 +10,13 @@ 
  * @version $Id$
  */
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling setup-cli as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling setup-cli as web-page
 {
 	die('<h1>checkout-build-archives.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 date_default_timezone_set('Europe/Berlin');	// to get ride of 5.3 warnings
 
 $verbose = 0;
@@ -135,7 +138,10 @@ 
 			case 'release':
 			case 'copychangelog':
 				$config[$name] = $value;
-				if ($value) array_unshift($config['run'],$name);
+				if ($value)
+				{
+					array_unshift($config['run'],$name);
+				}
 				break;
 
 			case 'editchangelog':
@@ -151,7 +157,10 @@ 
 				{
 					usage("Path '$value' not found!");
 				}
-				if (!in_array('obs',$config['run'])) $config['run'][] = 'obs';
+				if (!in_array('obs',$config['run']))
+				{
+					$config['run'][] = 'obs';
+				}
 				// fall through
 			default:
 				$config[$name] = $value;
@@ -209,7 +218,10 @@ 
 	}
 
 	$cmd = $config['git'].' log '.escapeshellarg($last_tag.'..HEAD');
-	if (getcwd() != $path) $cmd = 'cd '.$path.'; '.$cmd;
+	if (getcwd() != $path)
+	{
+		$cmd = 'cd '.$path.'; '.$cmd;
+	}
 	$output = null;
 	run_cmd($cmd, $output);
 
@@ -240,7 +252,10 @@ 
 {
 	global $config, $verbose;
 
-	if ($verbose) echo "Get modules from .mrconfig in checkoutdir $config[checkoutdir]\n";
+	if ($verbose)
+	{
+		echo "Get modules from .mrconfig in checkoutdir $config[checkoutdir]\n";
+	}
 
 	if (!is_dir($config['checkoutdir']))
 	{
@@ -271,12 +286,21 @@ 
 		elseif (isset($module) && preg_match('/^checkout\s*=\s*(git\s+clone\s+(-b\s+[0-9.]+\s+)?((git|http)[^ ]+)|svn\s+checkout\s+((svn|http)[^ ]+))/', $line, $matches))
 		{
 			$repo = $url = substr($matches[1], 0, 3) == 'svn' ? $matches[5] : $matches[3];
-			if (substr($matches[1], 0, 3) == 'svn') $repo = preg_replace('#/(trunk|branches)/.*$#', '', $repo);
+			if (substr($matches[1], 0, 3) == 'svn')
+			{
+				$repo = preg_replace('#/(trunk|branches)/.*$#', '', $repo);
+			}
 			$modules[$repo][$config['aliasdir'].($module ? '/'.$module : '')] = $url;
-			if ($module === '' && !isset($baseurl)) $baseurl = str_replace('/egroupware.git', '', $url);
+			if ($module === '' && !isset($baseurl))
+			{
+				$baseurl = str_replace('/egroupware.git', '', $url);
+			}
 		}
 	}
-	if ($verbose) print_r($modules);
+	if ($verbose)
+	{
+		print_r($modules);
+	}
 	return $modules;
 }
 
@@ -343,7 +367,11 @@ 
 
 	$config['tag'] = config_translate('tag');	// allow to use config vars like $version in tag
 
-	if (empty($config['tag'])) return;	// otherwise we copy everything in svn root!
+	if (empty($config['tag']))
+	{
+		return;
+	}
+	// otherwise we copy everything in svn root!
 
 	echo "Creating tag $config[tag]\n";
 
@@ -359,7 +387,10 @@ 
 	global $config,$verbose;
 
 	// push local changes to Github incl. tags
-	if ($verbose) echo "Pushing changes and tags\n";
+	if ($verbose)
+	{
+		echo "Pushing changes and tags\n";
+	}
 	chdir($config['checkoutdir']);
 	run_cmd($config['mr']. ' up');		// in case someone else pushed something
 	chdir($config['checkoutdir']);
@@ -421,7 +452,10 @@ 
 	{
 		$target = config_translate('release');	// allow to use config vars like $svnbranch in module
 		$cmd = $config['rsync'].' '.$archives.' '.$target;
-		if ($verbose) echo $cmd."\n";
+		if ($verbose)
+		{
+			echo $cmd."\n";
+		}
 		passthru($cmd);
 	}
 }
@@ -454,25 +488,40 @@ 
 	{
 		case 'POST':
 			curl_setopt($c, CURLOPT_POST, true);
-			if (is_array($data)) $data = json_encode($data, JSON_FORCE_OBJECT);
+			if (is_array($data))
+			{
+				$data = json_encode($data, JSON_FORCE_OBJECT);
+			}
 			curl_setopt($c, CURLOPT_POSTFIELDS, $data);
 			break;
 		case 'GET':
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if(count($data))
+			{
+				$url .= '?' . http_build_query($data);
+			}
 			break;
 		case 'FILE':
 			curl_setopt($c, CURLOPT_HTTPHEADER, array("Content-type: $content_type"));
 			curl_setopt($c, CURLOPT_POST, true);
 			curl_setopt($c, CURLOPT_POSTFIELDS, file_get_contents($upload));
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if(count($data))
+			{
+				$url .= '?' . http_build_query($data);
+			}
 			break;
 		default:
 			throw new Exception(__FUNCTION__.": Unknown/unimplemented method=$method!");
 	}
 	curl_setopt($c, CURLOPT_URL, $url);
 
-	if (is_string($data)) $short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
-	if ($verbose) echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	if (is_string($data))
+	{
+		$short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
+	}
+	if ($verbose)
+	{
+		echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	}
 
 	if (($response = curl_exec($c)) === false)
 	{
@@ -483,7 +532,10 @@ 
 		throw new Exception("$method request to $url failed ".(isset($short_data)&&$method!='GET'?$short_data:''));
 	}
 
-	if ($verbose) echo (strlen($response) > 200 ? substr($response, 0, 200).' ...' : $response)."\n";
+	if ($verbose)
+	{
+		echo (strlen($response) > 200 ? substr($response, 0, 200).' ...' : $response)."\n";
+	}
 
 	curl_close($c);
 
@@ -500,13 +552,19 @@ 
 {
 	global $config;
 
-	if (!isset($value)) $value = $config[$name];
+	if (!isset($value))
+	{
+		$value = $config[$name];
+	}
 	if (is_string($value) && strpos($value, '$') !== false)
 	{
 		$translate = array();
 		foreach($config as $n => $val)
 		{
-			if (is_string($val)) $translate['$'.$n] = $val;
+			if (is_string($val))
+			{
+				$translate['$'.$n] = $val;
+			}
 		}
 		$value = strtr($value, $translate);
 	}
@@ -608,7 +666,10 @@ 
 	if (is_null($revision))
 	{
 		list($tags_url,$branch) = preg_split('#/(branches/|trunk)#',$branch_url);
-		if (empty($branch)) $branch = $config['version'];
+		if (empty($branch))
+		{
+			$branch = $config['version'];
+		}
 		$tags_url .= '/tags';
 		$pattern='|/tags/('.preg_quote($config['version'], '|').'\.[0-9.]+)|';
 		$matches = null;
@@ -634,11 +695,18 @@ 
 	$message = '';
 	foreach($xml as $log)
 	{
-		if (!($msg = _match_log_pattern($log->msg, $log_pattern, $prefix))) continue;	// no match --> ignore
+		if (!($msg = _match_log_pattern($log->msg, $log_pattern, $prefix)))
+		{
+			continue;
+		}
+		// no match --> ignore
 
 		$message .= $msg."\n";
 	}
-	if ($verbose) echo $message;
+	if ($verbose)
+	{
+		echo $message;
+	}
 
 	return $message;
 }
@@ -669,7 +737,10 @@ 
 	{
 		return null;
 	}
-	if ($prefix_len && substr($msg,0,$prefix_len) != $prefix) $msg = $prefix.$msg;
+	if ($prefix_len && substr($msg,0,$prefix_len) != $prefix)
+	{
+		$msg = $prefix.$msg;
+	}
 
 	return $msg;
 }
@@ -706,7 +777,10 @@ 
 		if (!$is_regexp && strpos($log->paths->path, $pattern) !== false ||
 			$is_regexp && preg_match($pattern, $log->paths->path, $matches))
 		{
-			if ($verbose) echo "Revision {$log['revision']} matches".($matches?': '.$matches[1] : '')."\n";
+			if ($verbose)
+			{
+				echo "Revision {$log['revision']} matches".($matches?': '.$matches[1] : '')."\n";
+			}
 			return (int)$log['revision'];
 		}
 	}
@@ -726,7 +800,10 @@ 
 	{
 		usage("Path '$config[obs]' not found!");
 	}
-	if ($verbose) echo $only_update_changelog ? "Updating OBS changelogs\n" : "Updating OBS checkout\n";
+	if ($verbose)
+	{
+		echo $only_update_changelog ? "Updating OBS changelogs\n" : "Updating OBS checkout\n";
+	}
 	run_cmd('osc up '.$config['obs']);
 
 	$n = 0;
@@ -746,10 +823,16 @@ 
 			if (basename($path) != basename($new_name))
 			{
 				unlink($path);
-				if ($verbose) echo "rm $path\n";
+				if ($verbose)
+				{
+					echo "rm $path\n";
+				}
 			}
 			copy($new_name,dirname($path).'/'.basename($new_name));
-			if ($verbose) echo "cp $new_name ".dirname($path)."/\n";
+			if ($verbose)
+			{
+				echo "cp $new_name ".dirname($path)."/\n";
+			}
 			++$n;
 		}
 		// if we have no changelog (eg. because commands run separate), try parsing it from changelog file
@@ -787,7 +870,10 @@ 
 			if ($content != $content_was)
 			{
 				file_put_contents($path,$content);
-				if ($verbose) echo "Updated $path\n";
+				if ($verbose)
+				{
+					echo "Updated $path\n";
+				}
 				++$n;
 			}
 		}
@@ -825,9 +911,12 @@ 
 			}
 			$n += empty($lines[$n+1]) ? 2 : 1;	// overead empty line behind header
 			$logentry = '';
-			while($lines[$n])	// entry is terminated by empty line
+			while($lines[$n])
+			{
+				// entry is terminated by empty line
 			{
 				$logentry .= (substr($lines[$n], 0, 2) == '  ' ? substr($lines[$n], 2) : $lines[$n])."\n";
+			}
 				++$n;
 			}
 			return substr($logentry, 0, -1);	// remove training "\n"
@@ -848,7 +937,10 @@ 
 
 	list($header) = explode("\n", $content);
 	$new_header = preg_replace('/\('.preg_quote($config['version']).'\.[0-9.]+[0-9](.*)\)/','('.$config['version'].'.'.$config['packaging'].'\\1)', $header);
-	if (substr($config['changelog'],0,2) != '  ') $config['changelog'] = '  '.implode("\n  ",explode("\n",$config['changelog']));
+	if (substr($config['changelog'],0,2) != '  ')
+	{
+		$config['changelog'] = '  '.implode("\n  ",explode("\n",$config['changelog']));
+	}
 	$content = $new_header."\n\n".$config['changelog'].
 		"\n\n -- ".$config['changelog_packager'].'  '.date('r')."\n\n".$content;
 
@@ -862,10 +954,13 @@ 
 {
 	global $config;
 
-	if (substr($config['sourcedir'],0,2) == '~/')	// sha1_file cant deal with '~/rpm'
+	if (substr($config['sourcedir'],0,2) == '~/')
+	{
+		// sha1_file cant deal with '~/rpm'
 	{
 		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'],1);
 	}
+	}
 	$sumsfile = $config['sourcedir'].'/sha1sum-'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.txt';
 
 	if (!file_exists($sumsfile))
@@ -876,11 +971,17 @@ 
 	// signing it
 	if (empty($config['gpg']) || !file_exists($config['gpg']))
 	{
-		if (!empty($config['gpg'])) echo "{$config['gpg']} not found --> skipping signing sha1sum file!\n";
+		if (!empty($config['gpg']))
+		{
+			echo "{$config['gpg']} not found --> skipping signing sha1sum file!\n";
+		}
 		return;
 	}
 	echo "Signing sha1sum file:\n";
-	if (file_exists($sumsfile.'.asc')) unlink($sumsfile.'.asc');
+	if (file_exists($sumsfile.'.asc'))
+	{
+		unlink($sumsfile.'.asc');
+	}
 	$cmd = $config['gpg'].' --local-user '.$config['packager'].' --clearsign '.$sumsfile;
 	run_cmd($cmd);
 	unlink($sumsfile);	// delete the unsigned file
@@ -893,11 +994,17 @@ 
 {
 	global $config;
 
-	if (!file_exists($config['sourcedir'])) mkdir($config['sourcedir'],0755,true);
-	if (substr($config['sourcedir'],0,2) == '~/')	// sha1_file cant deal with '~/rpm'
+	if (!file_exists($config['sourcedir']))
+	{
+		mkdir($config['sourcedir'],0755,true);
+	}
+	if (substr($config['sourcedir'],0,2) == '~/')
+	{
+		// sha1_file cant deal with '~/rpm'
 	{
 		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'],1);
 	}
+	}
 	$sumsfile = $config['sourcedir'].'/sha1sum-'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.txt';
 	$sums = '';
 
@@ -935,12 +1042,22 @@ 
 				{
 					foreach((array)$config['all-add'] as $add)
 					{
-						if (substr($add, -4) != '.tar') continue;	// probably a module
-						if (!($tar = realpath($add))) throw new Exception("File '$add' not found!");
+						if (substr($add, -4) != '.tar')
+						{
+							continue;
+						}
+						// probably a module
+						if (!($tar = realpath($add)))
+						{
+							throw new Exception("File '$add' not found!");
+						}
 						$cmd .= '; '.$config['tar'].' --owner=root --group=root -Af '.$file.' '.$tar;
 					}
 				}
-				if (file_exists($file.'.bz2')) $cmd .= '; rm -f '.$file.'.bz2';
+				if (file_exists($file.'.bz2'))
+				{
+					$cmd .= '; rm -f '.$file.'.bz2';
+				}
 				$cmd .= '; '.$config['bzip2'].' '.$file;
 				// run cmd now and continue without adding all tar-ball to sums, as we dont want to publish it
 				run_cmd($cmd);
@@ -961,7 +1078,10 @@ 
 
 		foreach($config['extra'] as $name => $modules)
 		{
-			if (is_numeric($name)) $name = $modules;
+			if (is_numeric($name))
+			{
+				$name = $modules;
+			}
 			$dirs = ' egroupware/'.implode(' egroupware/', (array)$modules);
 			$file = $config['sourcedir'].'/'.$config['packagename'].'-'.$name.'-'.$config['version'].'.'.$config['packaging'].'.'.$type;
 			switch($type)
@@ -1002,7 +1122,10 @@ 
 	{
 		echo "Updating virus signatures\n";
 		$cmd = '/usr/bin/sudo '.$config['freshclam'];
-		if (!$verbose && function_exists('posix_getuid') && posix_getuid()) echo $cmd."\n";
+		if (!$verbose && function_exists('posix_getuid') && posix_getuid())
+		{
+			echo $cmd."\n";
+		}
 		$output = null;
 		run_cmd($cmd,$output,1);	// 1 = ignore already up to date database
 	}
@@ -1030,7 +1153,10 @@ 
 	}
 
 	// we need to stash uncommited changes like .mrconfig, before copying
-	if (file_exists($config['checkoutdir'].'/.git')) run_cmd("cd $config[checkoutdir]; git stash");
+	if (file_exists($config['checkoutdir'].'/.git'))
+	{
+		run_cmd("cd $config[checkoutdir]; git stash");
+	}
 
 	try {
 		$cmd = '/usr/bin/rsync -r --delete --delete-excluded --exclude .svn --exclude .git\* --exclude .mrconfig --exclude node_modules/ '.$config['checkoutdir'].'/ '.$config['egw_buildroot'].'/'.$config['aliasdir'].'/';
@@ -1039,8 +1165,14 @@ 
 	catch (Exception $e) {
 		// catch failures to pop stash, before throwing exception
 	}
-	if (file_exists($config['checkoutdir'].'/.git')) run_cmd("git stash pop");
-	if (isset($e)) throw $e;
+	if (file_exists($config['checkoutdir'].'/.git'))
+	{
+		run_cmd("git stash pop");
+	}
+	if (isset($e))
+	{
+		throw $e;
+	}
 
 	if (($cmd = config_translate('patchCmd')) && $cmd[0] != '#')
 	{
@@ -1125,9 +1257,12 @@ 
 				if ($ret || substr($line,0,5) == 'URL: ')
 				{
 					$url = substr($line,5);
-					if ($ret || substr($url,0,strlen($svnbranch)) != $svnbranch)	// wrong branch (or no svn dir)
+					if ($ret || substr($url,0,strlen($svnbranch)) != $svnbranch)
+					{
+						// wrong branch (or no svn dir)
 					{
 						echo "Checkout is of wrong branch --> deleting it\n";
+					}
 						system('/bin/rm -rf .svn '.$config['aliasdir']);	// --> remove the whole checkout
 						clearstatcache();
 					}
@@ -1174,19 +1309,31 @@ 
 	$svnbranch = $config['svnbase'].'/'.$config['svnbranch'];
 	$url = $svnbranch.'/'.$config['svnalias'];
 	$cmd = $svn.' propget svn:externals --strict '.$url;
-	if ($verbose) echo $cmd."\n";
+	if ($verbose)
+	{
+		echo $cmd."\n";
+	}
 	$output = $ret = null;
 	exec($cmd,$output,$ret);
 	$config['modules'] = array();
 	foreach($output as $line)
 	{
 		$line = trim($line);
-		if (empty($line) || $line[0] == '#') continue;
+		if (empty($line) || $line[0] == '#')
+		{
+			continue;
+		}
 		list($path,$url) = preg_split('/[ \t\r\n]+/',$line);
 		$matches = null;
-		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];
-		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';
+		}
 		$config['modules'][$repo][$path] = $url;
 	}
 	// process extra modules
@@ -1195,13 +1342,25 @@ 
 		$module = config_translate(null, $module);	// allow to use config vars like $svnbranch in module
 		$url = strpos($module,'://') === false ? $svnbranch.'/' : '';
 		$url .= $module;
-		if (strpos($module,'://') !== false) $module = basename($module);
-		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die("Invalid SVN URL: $url\n");
+		if (strpos($module,'://') !== false)
+		{
+			$module = basename($module);
+		}
+		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches))
+		{
+			die("Invalid SVN URL: $url\n");
+		}
 		$repo = $matches[1];
-		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';
+		}
 		$config['modules'][$repo][$config['aliasdir'].'/'.$module] = $url;
 	}
-	if ($verbose) print_r($config['modules']);
+	if ($verbose)
+	{
+		print_r($config['modules']);
+	}
 	return $config['modules'];
 }
 
@@ -1212,7 +1371,11 @@ 
 {
 	global $config,$svn;
 
-	if (empty($config['svntag'])) return;	// otherwise we copy everything in svn root!
+	if (empty($config['svntag']))
+	{
+		return;
+	}
+	// otherwise we copy everything in svn root!
 
 	$config['svntag'] = config_translate('svntag');	// allow to use config vars like $version in tag
 
@@ -1251,11 +1414,17 @@ 
 	{
 		$output[] = $cmd;
 		exec($cmd,$output,$ret);
-		if ($verbose) echo implode("\n",$output)."\n";
+		if ($verbose)
+		{
+			echo implode("\n",$output)."\n";
+		}
 	}
 	if ($ret && !in_array($ret,(array)$no_bailout))
 	{
-		if (!$verbose) echo implode("\n",$output)."\n";
+		if (!$verbose)
+		{
+			echo implode("\n",$output)."\n";
+		}
 		throw new Exception("Error during '$cmd' --> aborting",$ret);
 	}
 	return $ret;
@@ -1301,7 +1470,10 @@ 
 	echo "options and their defaults:\n";
 	if ($verbose)
 	{
-		if (!isset($config['modules'])) $config['modules'] = get_modules_per_repo();
+		if (!isset($config['modules']))
+		{
+			$config['modules'] = get_modules_per_repo();
+		}
 	}
 	else
 	{
@@ -1309,7 +1481,10 @@ 
 	}
 	foreach($config as $name => $default)
 	{
-		if (is_array($default)) $default = json_encode ($default, JSON_UNESCAPED_SLASHES);
+		if (is_array($default))
+		{
+			$default = json_encode ($default, JSON_UNESCAPED_SLASHES);
+		}
 		echo '--'.str_pad($name,20).$default."\n";
 	}
 	if ($error)

Spacing +176 added lines, -176 removed lines

@@ -14,15 +14,15 @@ 
 {
 	die('<h1>checkout-build-archives.php must NOT be called as web-page --> exiting !!!</h1>');
 }
-date_default_timezone_set('Europe/Berlin');	// to get ride of 5.3 warnings
+date_default_timezone_set('Europe/Berlin'); // to get ride of 5.3 warnings
 
 $verbose = 0;
 $config = array(
 	'packagename' => 'egroupware-epl',
-	'version' => '14.3',        // '14.3'
+	'version' => '14.3', // '14.3'
 	'packaging' => date('Ymd'), // '20160520'
-	'branch'  => '14.2',        // checked out branch
-	'tag' => '$version.$packaging',	// name of tag
+	'branch'  => '14.2', // checked out branch
+	'tag' => '$version.$packaging', // name of tag
 	'checkoutdir' => realpath(__DIR__.'/../..'),
 	'egw_buildroot' => '/tmp/build_root/epl_14.2_buildroot',
 	'sourcedir' => '/home/download/stylite-epl/egroupware-epl-14.2',
@@ -34,11 +34,11 @@ 
 	'svnalias' => 'aliases/default-ssh',    // default alias
 	'extra' => array('$stylitebase/$svnbranch/stylite', '$stylitebase/$svnbranch/esyncpro', '$stylitebase/trunk/archive'),//, '$stylitebase/$svnbranch/groups'), //,'svn+ssh://stylite@svn.stylite.de/stylite/trunk/eventmgr'),
 	*/
-	'extra' => array('stylite', 'esyncpro', 'archive'),	// create an extra archive for given apps
+	'extra' => array('stylite', 'esyncpro', 'archive'), // create an extra archive for given apps
 		// these apps are placed in egroupware-epl-contrib archive
 		//'contrib' => array('phpgwapi', 'etemplate', 'jdots', 'phpbrain', 'wiki', 'sambaadmin', 'sitemgr', 'phpfreechat')),
-	'aliasdir' => 'egroupware',             // directory created by the alias
-	'types' => array('tar.bz2','tar.gz','zip','all.tar.bz2'),
+	'aliasdir' => 'egroupware', // directory created by the alias
+	'types' => array('tar.bz2', 'tar.gz', 'zip', 'all.tar.bz2'),
 	// add given extra-apps or (uncompressed!) archives to above all.tar.bz2 archive
 	'all-add' => array(/*'contrib',*/ '/home/stylite/epl-trunk/phpfreechat_data_public.tar'),
 	// diverse binaries we need
@@ -55,35 +55,35 @@ 
 	'gpg' => trim(`which gpg`),
 	'editor' => trim(`which vi`),
 	'rsync' => trim(`which rsync`).' --progress -e ssh --exclude "*-stylite-*" --exclude "*-esyncpro-*"',
-	'composer' => ($composer=trim(`which composer.phar`)) ? $composer.' install --ignore-platform-reqs' : '',
+	'composer' => ($composer = trim(`which composer.phar`)) ? $composer.' install --ignore-platform-reqs' : '',
 	'after-checkout' => 'rm -rf */source */templates/*/source',
 	'packager' => 'build@stylite.de',
 	'obs' => '/home/stylite/obs/stylite-epl',
-	'obs_package_alias' => '',	// name used in obs package, if different from packagename
-	'changelog' => false,   // eg. '* 1. Zeile\n* 2. Zeile' for debian.changes
+	'obs_package_alias' => '', // name used in obs package, if different from packagename
+	'changelog' => false, // eg. '* 1. Zeile\n* 2. Zeile' for debian.changes
 	'changelog_packager' => 'Ralf Becker <rb@stylite.de>',
 	'editchangelog' => '* ',
 	//'sfuser' => 'ralfbecker',
 	//'release' => '$sfuser,egroupware@frs.sourceforge.net:/home/frs/project/e/eg/egroupware/eGroupware-$version/eGroupware-$version.$packaging/',
 	'copychangelog' => '$sourcedir/README', //'$sfuser,egroupware@frs.sourceforge.net:/home/frs/project/e/eg/egroupware/README',
 	'skip' => array(),
-	'run' => array('checkout','editchangelog','tag','copy','virusscan','create','sign','obs','copychangelog'),
+	'run' => array('checkout', 'editchangelog', 'tag', 'copy', 'virusscan', 'create', 'sign', 'obs', 'copychangelog'),
 	'patchCmd' => '# run cmd after copy eg. "cd $egw_buildroot; patch -p1 /path/to/patch"',
-	'github_user' => 'ralfbecker',	// Github user for following token
-	'github_token' => '',	// Github repo personal access token from above user
+	'github_user' => 'ralfbecker', // Github user for following token
+	'github_token' => '', // Github repo personal access token from above user
 );
 
 // process config from command line
 $argv = $_SERVER['argv'];
 $prog = array_shift($argv);
 
-while(($arg = array_shift($argv)))
+while (($arg = array_shift($argv)))
 {
 	if ($arg == '-v' || $arg == '--verbose')
 	{
 		++$verbose;
 	}
-	elseif($arg == '-h' || $arg == '--help')
+	elseif ($arg == '-h' || $arg == '--help')
 	{
 		if (in_array('editchangelog', $config['skip']) || !in_array('editchangelog', $config['run']))
 		{
@@ -91,10 +91,10 @@ 
 		}
 		usage();
 	}
-	elseif(substr($arg,0,2) == '--' && isset($config[$name=substr($arg,2)]))
+	elseif (substr($arg, 0, 2) == '--' && isset($config[$name = substr($arg, 2)]))
 	{
 		$value = array_shift($argv);
-		switch($name)
+		switch ($name)
 		{
 			case 'extra':	// stored as array and allow to add/delete items with +/- prefix
 			case 'types':
@@ -117,7 +117,7 @@ 
 				{
 					$value = array_unique(preg_split('/[ ,]+/', $value));
 				}
-				switch($op)
+				switch ($op)
 				{
 					case '+':
 						$config[$name] = array_unique(array_merge($config[$name], $value));
@@ -135,14 +135,14 @@ 
 			case 'release':
 			case 'copychangelog':
 				$config[$name] = $value;
-				if ($value) array_unshift($config['run'],$name);
+				if ($value) array_unshift($config['run'], $name);
 				break;
 
 			case 'editchangelog':
 				$config[$name] = $value ? $value : true;
-				if (!in_array('editchangelog',$config['run']))
+				if (!in_array('editchangelog', $config['run']))
 				{
-					array_unshift($config['run'],'editchangelog');
+					array_unshift($config['run'], 'editchangelog');
 				}
 				break;
 
@@ -151,7 +151,7 @@ 
 				{
 					usage("Path '$value' not found!");
 				}
-				if (!in_array('obs',$config['run'])) $config['run'][] = 'obs';
+				if (!in_array('obs', $config['run'])) $config['run'][] = 'obs';
 				// fall through
 			default:
 				$config[$name] = $value;
@@ -169,16 +169,16 @@ 
 }
 $svn = $config['svn'];
 
-$run = array_diff($config['run'],$config['skip']);
+$run = array_diff($config['run'], $config['skip']);
 
 // if we dont edit the changelog, set packaging from changelog
 if (!in_array('editchangelog', $run))
 {
 	parse_current_changelog(true);
 }
-foreach($run as $func)
+foreach ($run as $func)
 {
-	chdir(dirname(__FILE__));	// make relative filenames work, if other command changes dir
+	chdir(dirname(__FILE__)); // make relative filenames work, if other command changes dir
 	call_user_func('do_'.$func);
 }
 
@@ -193,7 +193,7 @@ 
  * @param string $prefix ='* ' prefix, which if not presend should be added to all log messages
  * @return string with changelog
  */
-function get_changelog_from_git($_path, $log_pattern=null, &$last_tag=null, $prefix='* ')
+function get_changelog_from_git($_path, $log_pattern = null, &$last_tag = null, $prefix = '* ')
 {
 	//echo __FUNCTION__."('$branch_url','$log_pattern','$revision','$prefix')\n";
 	global $config;
@@ -214,7 +214,7 @@ 
 	run_cmd($cmd, $output);
 
 	$changelog = '';
-	foreach($output as $line)
+	foreach ($output as $line)
 	{
 		if (substr($line, 0, 4) == "    " && ($msg = _match_log_pattern(substr($line, 4), $log_pattern, $prefix)))
 		{
@@ -246,13 +246,13 @@ 
 	{
 		throw new Exception("checkout directory '{$config['checkoutdir']} does NOT exists or is NO directory!");
 	}
-	if (!($mrconfig = file_get_contents($path=$config['checkoutdir'].'/.mrconfig')))
+	if (!($mrconfig = file_get_contents($path = $config['checkoutdir'].'/.mrconfig')))
 	{
 		throw new Exception("$path not found!");
 	}
 	$module = $baseurl = null;
 	$modules = array();
-	foreach(explode("\n", $mrconfig) as $line)
+	foreach (explode("\n", $mrconfig) as $line)
 	{
 		$matches = null;
 		if (isset($baseurl))
@@ -317,7 +317,7 @@ 
 		$cmd = $config['git'].' clone '.(!empty($config['branch']) ? ' -b '.$config['branch'] : '').
 			' git@github.com:EGroupware/egroupware.git '.$config['checkoutdir'];
 		run_cmd($cmd);
-		run_cmd('mr up');	// need to run mr up twice for new checkout, because chained .mrconfig wont run first time (because not there yet!)
+		run_cmd('mr up'); // need to run mr up twice for new checkout, because chained .mrconfig wont run first time (because not there yet!)
 	}
 	elseif (!is_dir($config['checkoutdir']) || !is_writable($config['checkoutdir']))
 	{
@@ -341,9 +341,9 @@ 
 	}
 	chdir($config['checkoutdir']);
 
-	$config['tag'] = config_translate('tag');	// allow to use config vars like $version in tag
+	$config['tag'] = config_translate('tag'); // allow to use config vars like $version in tag
 
-	if (empty($config['tag'])) return;	// otherwise we copy everything in svn root!
+	if (empty($config['tag'])) return; // otherwise we copy everything in svn root!
 
 	echo "Creating tag $config[tag]\n";
 
@@ -356,16 +356,16 @@ 
  */
 function do_release()
 {
-	global $config,$verbose;
+	global $config, $verbose;
 
 	// push local changes to Github incl. tags
 	if ($verbose) echo "Pushing changes and tags\n";
 	chdir($config['checkoutdir']);
-	run_cmd($config['mr']. ' up');		// in case someone else pushed something
+	run_cmd($config['mr'].' up'); // in case someone else pushed something
 	chdir($config['checkoutdir']);
-	run_cmd($config['git'].' push');	// regular commits like changelog
+	run_cmd($config['git'].' push'); // regular commits like changelog
 	$tag = config_translate('tag');
-	run_cmd($config['mr']. ' push origin '.$tag);	// pushing tags in all apps
+	run_cmd($config['mr'].' push origin '.$tag); // pushing tags in all apps
 
 	if (empty($config['github_user']) || empty($config['github_token']))
 	{
@@ -382,26 +382,26 @@ 
 		'body' => $config['changelog'],
 	);
 	$response = github_api("/repos/EGroupware/egroupware/releases", $data);
-	$upload_url = preg_replace('/{\?[^}]+}$/', '', $response['upload_url']);	// remove {?name,label} template
+	$upload_url = preg_replace('/{\?[^}]+}$/', '', $response['upload_url']); // remove {?name,label} template
 
 	$archives = $config['sourcedir'].'/*egroupware-epl-'.$config['version'].'.'.$config['packaging'].'*';
 
-	foreach(glob($archives) as $path)
+	foreach (glob($archives) as $path)
 	{
 		$label = null;
 		if (substr($path, -4) == '.zip')
 		{
 			$content_type = 'application/zip';
 		}
-		elseif(substr($path, -7) == '.tar.gz')
+		elseif (substr($path, -7) == '.tar.gz')
 		{
 			$content_type = 'application/x-gzip';
 		}
-		elseif(substr($path, -8) == '.tar.bz2')
+		elseif (substr($path, -8) == '.tar.bz2')
 		{
 			$content_type = 'application/x-bzip2';
 		}
-		elseif(substr($path, -8) == '.txt.asc')
+		elseif (substr($path, -8) == '.txt.asc')
 		{
 			$content_type = 'text/plain';
 			$label = 'Signed hashes of downloads';
@@ -419,7 +419,7 @@ 
 
 	if (!empty($config['release']))
 	{
-		$target = config_translate('release');	// allow to use config vars like $svnbranch in module
+		$target = config_translate('release'); // allow to use config vars like $svnbranch in module
 		$cmd = $config['rsync'].' '.$archives.' '.$target;
 		if ($verbose) echo $cmd."\n";
 		passthru($cmd);
@@ -437,7 +437,7 @@ 
  * @throws Exception
  * @return array with response
  */
-function github_api($_url, $data, $method='POST', $upload=null, $content_type=null)
+function github_api($_url, $data, $method = 'POST', $upload = null, $content_type = null)
 {
 	global $config, $verbose;
 
@@ -450,7 +450,7 @@ 
 	curl_setopt($c, CURLOPT_TIMEOUT, 240);
 	curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
 
-	switch($method)
+	switch ($method)
 	{
 		case 'POST':
 			curl_setopt($c, CURLOPT_POST, true);
@@ -458,13 +458,13 @@ 
 			curl_setopt($c, CURLOPT_POSTFIELDS, $data);
 			break;
 		case 'GET':
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if (count($data)) $url .= '?'.http_build_query($data);
 			break;
 		case 'FILE':
 			curl_setopt($c, CURLOPT_HTTPHEADER, array("Content-type: $content_type"));
 			curl_setopt($c, CURLOPT_POST, true);
 			curl_setopt($c, CURLOPT_POSTFIELDS, file_get_contents($upload));
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if (count($data)) $url .= '?'.http_build_query($data);
 			break;
 		default:
 			throw new Exception(__FUNCTION__.": Unknown/unimplemented method=$method!");
@@ -472,7 +472,7 @@ 
 	curl_setopt($c, CURLOPT_URL, $url);
 
 	if (is_string($data)) $short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
-	if ($verbose) echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	if ($verbose) echo "Sending $method request to $url ".(isset($short_data) && $method != 'GET' ? $short_data : '')."\n";
 
 	if (($response = curl_exec($c)) === false)
 	{
@@ -480,7 +480,7 @@ 
 		curl_setopt($c, CURLOPT_HEADER, true);
 		curl_setopt($c, CURLOPT_RETURNTRANSFER, false);
 		curl_exec($c);
-		throw new Exception("$method request to $url failed ".(isset($short_data)&&$method!='GET'?$short_data:''));
+		throw new Exception("$method request to $url failed ".(isset($short_data) && $method != 'GET' ? $short_data : ''));
 	}
 
 	if ($verbose) echo (strlen($response) > 200 ? substr($response, 0, 200).' ...' : $response)."\n";
@@ -496,7 +496,7 @@ 
  * @param string $name
  * @param string $value =null value to use, default $config[$name]
  */
-function config_translate($name, $value=null)
+function config_translate($name, $value = null)
 {
 	global $config;
 
@@ -504,7 +504,7 @@ 
 	if (is_string($value) && strpos($value, '$') !== false)
 	{
 		$translate = array();
-		foreach($config as $n => $val)
+		foreach ($config as $n => $val)
 		{
 			if (is_string($val)) $translate['$'.$n] = $val;
 		}
@@ -530,7 +530,7 @@ 
  */
 function do_editchangelog()
 {
-	global $config,$svn;
+	global $config, $svn;
 
 	echo "Querying changelog from Git/SVN\n";
 	if (!isset($config['modules']))
@@ -540,7 +540,7 @@ 
 	// query changelog per repo
 	$changelog = '';
 	$last_tag = null;
-	foreach($config['modules'] as $branch_url => $modules)
+	foreach ($config['modules'] as $branch_url => $modules)
 	{
 		$revision = null;
 		if (substr($branch_url, -4) == '.git')
@@ -553,15 +553,15 @@ 
 			$changelog .= get_changelog_from_svn($branch_url, $config['editchangelog'], $revision);
 		}
 	}
-	$logfile = tempnam('/tmp','checkout-build-archives');
-	file_put_contents($logfile,$changelog);
+	$logfile = tempnam('/tmp', 'checkout-build-archives');
+	file_put_contents($logfile, $changelog);
 	$cmd = $config['editor'].' '.escapeshellarg($logfile);
 	passthru($cmd);
 	$config['changelog'] = file_get_contents($logfile);
 	// remove trailing newlines
-	while (substr($config['changelog'],-1) == "\n")
+	while (substr($config['changelog'], -1) == "\n")
 	{
-		$config['changelog'] = substr($config['changelog'],0,-1);
+		$config['changelog'] = substr($config['changelog'], 0, -1);
 	}
 	// allow user to abort, by deleting the changelog
 	if (strlen($config['changelog']) <= 2)
@@ -586,7 +586,7 @@ 
 	run_cmd($cmd);
 
 	// update obs changelogs (so all changlogs are updated in case of a later error and changelog step can be skiped)
-	do_obs(true);	// true: only update debian.changes in obs checkouts
+	do_obs(true); // true: only update debian.changes in obs checkouts
 }
 
 /**
@@ -600,41 +600,41 @@ 
  * @param string $prefix ='* ' prefix, which if not presend should be added to all log messages
  * @return string with changelog
  */
-function get_changelog_from_svn($branch_url, $log_pattern=null, &$revision=null, $prefix='* ')
+function get_changelog_from_svn($branch_url, $log_pattern = null, &$revision = null, $prefix = '* ')
 {
 	//echo __FUNCTION__."('$branch_url','$log_pattern','$revision','$prefix')\n";
-	global $config,$verbose,$svn;
+	global $config, $verbose, $svn;
 
 	if (is_null($revision))
 	{
-		list($tags_url,$branch) = preg_split('#/(branches/|trunk)#',$branch_url);
+		list($tags_url, $branch) = preg_split('#/(branches/|trunk)#', $branch_url);
 		if (empty($branch)) $branch = $config['version'];
 		$tags_url .= '/tags';
-		$pattern='|/tags/('.preg_quote($config['version'], '|').'\.[0-9.]+)|';
+		$pattern = '|/tags/('.preg_quote($config['version'], '|').'\.[0-9.]+)|';
 		$matches = null;
-		$revision = get_last_svn_tag($tags_url,$pattern,$matches);
+		$revision = get_last_svn_tag($tags_url, $pattern, $matches);
 		$tag = $matches[1];
 	}
-	elseif(!is_numeric($revision))
+	elseif (!is_numeric($revision))
 	{
-		$revision = get_last_svn_tag($tags_url,$tag=$revision);
+		$revision = get_last_svn_tag($tags_url, $tag = $revision);
 	}
 	$cmd = $svn.' log --xml -r '.escapeshellarg($revision.':HEAD').' '.escapeshellarg($branch_url);
 	if (($v = $verbose))
 	{
 		echo "Querying SVN for log from r$revision".($tag ? " ($tag)" : '').":\n$cmd\n";
-		$verbose = false;	// otherwise no $output!
+		$verbose = false; // otherwise no $output!
 	}
 	$output = array();
-	run_cmd($cmd,$output);
+	run_cmd($cmd, $output);
 	$verbose = $v;
-	array_shift($output);	// remove the command
+	array_shift($output); // remove the command
 
-	$xml = simplexml_load_string($output=implode("\n",$output));
+	$xml = simplexml_load_string($output = implode("\n", $output));
 	$message = '';
-	foreach($xml as $log)
+	foreach ($xml as $log)
 	{
-		if (!($msg = _match_log_pattern($log->msg, $log_pattern, $prefix))) continue;	// no match --> ignore
+		if (!($msg = _match_log_pattern($log->msg, $log_pattern, $prefix))) continue; // no match --> ignore
 
 		$message .= $msg."\n";
 	}
@@ -651,25 +651,25 @@ 
  * @param string $prefix ='* '
  * @return string
  */
-function _match_log_pattern($msg, $log_pattern, $prefix='* ')
+function _match_log_pattern($msg, $log_pattern, $prefix = '* ')
 {
 	$pattern_len = strlen($log_pattern);
 	$prefix_len = strlen($prefix);
 
 	$matches = null;
-	if ($log_pattern[0] == '/' && preg_match($log_pattern,$msg,$matches))
+	if ($log_pattern[0] == '/' && preg_match($log_pattern, $msg, $matches))
 	{
 		$msg = $matches[1];
 	}
-	elseif($log_pattern && $log_pattern[0] != '/' && substr($msg,0,$pattern_len) == $log_pattern)
+	elseif ($log_pattern && $log_pattern[0] != '/' && substr($msg, 0, $pattern_len) == $log_pattern)
 	{
-		list($msg) = explode("\n",$msg);
+		list($msg) = explode("\n", $msg);
 	}
-	elseif($log_pattern)
+	elseif ($log_pattern)
 	{
 		return null;
 	}
-	if ($prefix_len && substr($msg,0,$prefix_len) != $prefix) $msg = $prefix.$msg;
+	if ($prefix_len && substr($msg, 0, $prefix_len) != $prefix) $msg = $prefix.$msg;
 
 	return $msg;
 }
@@ -683,30 +683,30 @@ 
  * @param array &$matches=null on return matches of preg_match
  * @return int revision of last svn tag matching pattern
  */
-function get_last_svn_tag($tags_url,$pattern,&$matches=null)
+function get_last_svn_tag($tags_url, $pattern, &$matches = null)
 {
-	global $verbose,$svn;
+	global $verbose, $svn;
 
 	$cmd = $svn.' log --xml --limit 40 -v '.escapeshellarg($tags_url);
 	if (($v = $verbose))
 	{
 		echo "Querying SVN for last tags\n$cmd\n";
-		$verbose = false;	// otherwise no $output!
+		$verbose = false; // otherwise no $output!
 	}
 	$output = array();
-	run_cmd($cmd,$output);
+	run_cmd($cmd, $output);
 	$verbose = $v;
-	array_shift($output);	// remove the command
+	array_shift($output); // remove the command
 
-	$xml = simplexml_load_string($output=implode("\n",$output));
+	$xml = simplexml_load_string($output = implode("\n", $output));
 	$is_regexp = $pattern[0] == substr($pattern, -1);
-	foreach($xml as $log)
+	foreach ($xml as $log)
 	{
 		//print_r($log);
 		if (!$is_regexp && strpos($log->paths->path, $pattern) !== false ||
 			$is_regexp && preg_match($pattern, $log->paths->path, $matches))
 		{
-			if ($verbose) echo "Revision {$log['revision']} matches".($matches?': '.$matches[1] : '')."\n";
+			if ($verbose) echo "Revision {$log['revision']} matches".($matches ? ': '.$matches[1] : '')."\n";
 			return (int)$log['revision'];
 		}
 	}
@@ -718,9 +718,9 @@ 
  *
  * @param boolean $only_update_changelog =false true update debian.changes, but nothing else, nor commit it
  */
-function do_obs($only_update_changelog=false)
+function do_obs($only_update_changelog = false)
 {
-	global $config,$verbose;
+	global $config, $verbose;
 
 	if (!is_dir($config['obs']))
 	{
@@ -730,25 +730,25 @@ 
 	run_cmd('osc up '.$config['obs']);
 
 	$n = 0;
-	foreach(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($config['obs'])) as $path)
+	foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($config['obs'])) as $path)
 	{
 		if (basename(dirname($path)) == '.osc' ||
 			!preg_match('/\/('.preg_quote($config['packagename']).
 				($config['obs_package_alias'] ? '|'.preg_quote($config['obs_package_alias']) : '').
-				')[a-z-]*-('.preg_quote($config['version']).'|14.2|trunk)/',$path))
+				')[a-z-]*-('.preg_quote($config['version']).'|14.2|trunk)/', $path))
 		{
 			continue;
 		}
 		$matches = null;
-		if (preg_match('/\/('.preg_quote($config['packagename']).'[a-z-]*)-'.preg_quote($config['version']).'\.[0-9.]+[0-9](\.tar\.(gz|bz2))$/',$path,$matches) &&
-			file_exists($new_name=$config['sourcedir'].'/'.$matches[1].'-'.$config['version'].'.'.$config['packaging'].$matches[2]))
+		if (preg_match('/\/('.preg_quote($config['packagename']).'[a-z-]*)-'.preg_quote($config['version']).'\.[0-9.]+[0-9](\.tar\.(gz|bz2))$/', $path, $matches) &&
+			file_exists($new_name = $config['sourcedir'].'/'.$matches[1].'-'.$config['version'].'.'.$config['packaging'].$matches[2]))
 		{
 			if (basename($path) != basename($new_name))
 			{
 				unlink($path);
 				if ($verbose) echo "rm $path\n";
 			}
-			copy($new_name,dirname($path).'/'.basename($new_name));
+			copy($new_name, dirname($path).'/'.basename($new_name));
 			if ($verbose) echo "cp $new_name ".dirname($path)."/\n";
 			++$n;
 		}
@@ -758,35 +758,35 @@ 
 			$config['changelog'] = parse_current_changelog();
 		}
 		// updating dsc, spec and changelog files
-		if (!$only_update_changelog && (substr($path,-4) == '.dsc' || substr($path,-5) == '.spec') ||
+		if (!$only_update_changelog && (substr($path, -4) == '.dsc' || substr($path, -5) == '.spec') ||
 			!empty($config['changelog']) && basename($path) == 'debian.changes')
 		{
 			$content = $content_was = file_get_contents($path);
 
-			if (substr($path,-4) == '.dsc' || substr($path,-5) == '.spec')
+			if (substr($path, -4) == '.dsc' || substr($path, -5) == '.spec')
 			{
-				$content = preg_replace('/^Version: '.preg_quote($config['version']).'\.[0-9.]+[0-9]/m','Version: '.$config['version'].'.'.$config['packaging'],$content);
+				$content = preg_replace('/^Version: '.preg_quote($config['version']).'\.[0-9.]+[0-9]/m', 'Version: '.$config['version'].'.'.$config['packaging'], $content);
 			}
-			if (substr($path,-4) == '.dsc')
+			if (substr($path, -4) == '.dsc')
 			{
 				$content = preg_replace('/^(Debtransform-Tar: '.preg_quote($config['packagename']).'[a-z-]*)-'.
 					preg_quote($config['version']).'\.[0-9.]+[0-9](\.tar\.(gz|bz2))$/m',
-					'\\1-'.$config['version'].'.'.$config['packaging'].'\\2',$content);
+					'\\1-'.$config['version'].'.'.$config['packaging'].'\\2', $content);
 			}
-			if (basename($path) == 'debian.changes' && strpos($content,$config['version'].'.'.$config['packaging']) === false)
+			if (basename($path) == 'debian.changes' && strpos($content, $config['version'].'.'.$config['packaging']) === false)
 			{
 				$content = update_changelog($content);
 			}
-			if (!empty($config['changelog']) && substr($path,-5) == '.spec' &&
-				($pos_changelog = strpos($content,'%changelog')) !== false)
+			if (!empty($config['changelog']) && substr($path, -5) == '.spec' &&
+				($pos_changelog = strpos($content, '%changelog')) !== false)
 			{
 				$pos_changelog += strlen("%changelog\n");
-				$content = substr($content,0,$pos_changelog).' *'.date('D M d Y').' '.$config['changelog_packager']."\n".
-					$config['changelog']."\n".substr($content,$pos_changelog);
+				$content = substr($content, 0, $pos_changelog).' *'.date('D M d Y').' '.$config['changelog_packager']."\n".
+					$config['changelog']."\n".substr($content, $pos_changelog);
 			}
 			if ($content != $content_was)
 			{
-				file_put_contents($path,$content);
+				file_put_contents($path, $content);
 				if ($verbose) echo "Updated $path\n";
 				++$n;
 			}
@@ -807,33 +807,33 @@ 
  * @param boolean $set_packaging =false true: set packaging from last changelog entry
  * @return string changelog entries without header and footer lines
  */
-function parse_current_changelog($set_packaging=false)
+function parse_current_changelog($set_packaging = false)
 {
 	global $config;
 
 	$changelog = file_get_contents($config['checkoutdir'].'/doc/rpm-build/debian.changes');
 	$lines = explode("\n", $changelog, 100);
 	$matches = null;
-	foreach($lines as $n => $line)
+	foreach ($lines as $n => $line)
 	{
-		if (preg_match($preg='/^'.preg_quote($config['packagename']).' \('.preg_quote($config['version']).'\.'.
+		if (preg_match($preg = '/^'.preg_quote($config['packagename']).' \('.preg_quote($config['version']).'\.'.
 			($set_packaging ? '([0-9]+)' : preg_quote($config['packaging'])).'/', $line, $matches))
 		{
 			if ($set_packaging)
 			{
 				$config['packaging'] = $matches[1];
 			}
-			$n += empty($lines[$n+1]) ? 2 : 1;	// overead empty line behind header
+			$n += empty($lines[$n + 1]) ? 2 : 1; // overead empty line behind header
 			$logentry = '';
-			while($lines[$n])	// entry is terminated by empty line
+			while ($lines[$n])	// entry is terminated by empty line
 			{
 				$logentry .= (substr($lines[$n], 0, 2) == '  ' ? substr($lines[$n], 2) : $lines[$n])."\n";
 				++$n;
 			}
-			return substr($logentry, 0, -1);	// remove training "\n"
+			return substr($logentry, 0, -1); // remove training "\n"
 		}
 	}
-	return null;	// paragraph for current version NOT found
+	return null; // paragraph for current version NOT found
 }
 
 /**
@@ -847,8 +847,8 @@ 
 	global $config;
 
 	list($header) = explode("\n", $content);
-	$new_header = preg_replace('/\('.preg_quote($config['version']).'\.[0-9.]+[0-9](.*)\)/','('.$config['version'].'.'.$config['packaging'].'\\1)', $header);
-	if (substr($config['changelog'],0,2) != '  ') $config['changelog'] = '  '.implode("\n  ",explode("\n",$config['changelog']));
+	$new_header = preg_replace('/\('.preg_quote($config['version']).'\.[0-9.]+[0-9](.*)\)/', '('.$config['version'].'.'.$config['packaging'].'\\1)', $header);
+	if (substr($config['changelog'], 0, 2) != '  ') $config['changelog'] = '  '.implode("\n  ", explode("\n", $config['changelog']));
 	$content = $new_header."\n\n".$config['changelog'].
 		"\n\n -- ".$config['changelog_packager'].'  '.date('r')."\n\n".$content;
 
@@ -862,9 +862,9 @@ 
 {
 	global $config;
 
-	if (substr($config['sourcedir'],0,2) == '~/')	// sha1_file cant deal with '~/rpm'
+	if (substr($config['sourcedir'], 0, 2) == '~/')	// sha1_file cant deal with '~/rpm'
 	{
-		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'],1);
+		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'], 1);
 	}
 	$sumsfile = $config['sourcedir'].'/sha1sum-'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.txt';
 
@@ -883,7 +883,7 @@ 
 	if (file_exists($sumsfile.'.asc')) unlink($sumsfile.'.asc');
 	$cmd = $config['gpg'].' --local-user '.$config['packager'].' --clearsign '.$sumsfile;
 	run_cmd($cmd);
-	unlink($sumsfile);	// delete the unsigned file
+	unlink($sumsfile); // delete the unsigned file
 }
 
 /**
@@ -893,22 +893,22 @@ 
 {
 	global $config;
 
-	if (!file_exists($config['sourcedir'])) mkdir($config['sourcedir'],0755,true);
-	if (substr($config['sourcedir'],0,2) == '~/')	// sha1_file cant deal with '~/rpm'
+	if (!file_exists($config['sourcedir'])) mkdir($config['sourcedir'], 0755, true);
+	if (substr($config['sourcedir'], 0, 2) == '~/')	// sha1_file cant deal with '~/rpm'
 	{
-		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'],1);
+		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'], 1);
 	}
 	$sumsfile = $config['sourcedir'].'/sha1sum-'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.txt';
 	$sums = '';
 
 	chdir($config['egw_buildroot']);
 
-	if($config['extra'])
+	if ($config['extra'])
 	{
 		$exclude = $exclude_all = array();
-		foreach($config['extra'] as $name => $modules)
+		foreach ($config['extra'] as $name => $modules)
 		{
-			foreach((array)$modules as $module)
+			foreach ((array)$modules as $module)
 			{
 				$exclude[] = basename($module);
 				if (!empty($config['all-add']) && !in_array($module, $config['all-add']) && (is_int($name) || !in_array($name, $config['all-add'])))
@@ -918,24 +918,24 @@ 
 			}
 		}
 		$exclude_extra = ' --exclude=egroupware/'.implode(' --exclude=egroupware/', $exclude);
-		$exclude_all_extra =  $exclude_all ? ' --exclude=egroupware/'.implode(' --exclude=egroupware/', $exclude_all) : '';
+		$exclude_all_extra = $exclude_all ? ' --exclude=egroupware/'.implode(' --exclude=egroupware/', $exclude_all) : '';
 	}
-	foreach($config['types'] as $type)
+	foreach ($config['types'] as $type)
 	{
 		echo "Creating $type archives\n";
 		$tar_type = $type == 'tar.bz2' ? 'j' : 'z';
 
 		$file = $config['sourcedir'].'/'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.'.$type;
-		switch($type)
+		switch ($type)
 		{
 			case 'all.tar.bz2':	// single tar-ball for debian builds not easily supporting to use multiple
 				$file = $config['sourcedir'].'/'.$config['packagename'].'-all-'.$config['version'].'.'.$config['packaging'].'.tar';
 				$cmd = $config['tar'].' --owner=root --group=root -cf '.$file.$exclude_all_extra.' egroupware';
 				if (!empty($config['all-add']))
 				{
-					foreach((array)$config['all-add'] as $add)
+					foreach ((array)$config['all-add'] as $add)
 					{
-						if (substr($add, -4) != '.tar') continue;	// probably a module
+						if (substr($add, -4) != '.tar') continue; // probably a module
 						if (!($tar = realpath($add))) throw new Exception("File '$add' not found!");
 						$cmd .= '; '.$config['tar'].' --owner=root --group=root -Af '.$file.' '.$tar;
 					}
@@ -959,15 +959,15 @@ 
 		run_cmd($cmd);
 		$sums .= sha1_file($file)."\t".basename($file)."\n";
 
-		foreach($config['extra'] as $name => $modules)
+		foreach ($config['extra'] as $name => $modules)
 		{
 			if (is_numeric($name)) $name = $modules;
 			$dirs = ' egroupware/'.implode(' egroupware/', (array)$modules);
 			$file = $config['sourcedir'].'/'.$config['packagename'].'-'.$name.'-'.$config['version'].'.'.$config['packaging'].'.'.$type;
-			switch($type)
+			switch ($type)
 			{
 				case 'all.tar.bz2':
-					break;	// nothing to do
+					break; // nothing to do
 				case 'tar.bz2':
 				case 'tar.gz':
 					$cmd = $config['tar'].' --owner=root --group=root -c'.$tar_type.'f '.$file.$dirs;
@@ -982,7 +982,7 @@ 
 		}
 	}
 	// writing sha1sum file
-	file_put_contents($sumsfile,$sums);
+	file_put_contents($sumsfile, $sums);
 }
 
 /**
@@ -990,7 +990,7 @@ 
  */
 function do_virusscan()
 {
-	global $config,$verbose;
+	global $config, $verbose;
 
 	if (!file_exists($config['clamscan']) || !is_executable($config['clamscan']))
 	{
@@ -1004,7 +1004,7 @@ 
 		$cmd = '/usr/bin/sudo '.$config['freshclam'];
 		if (!$verbose && function_exists('posix_getuid') && posix_getuid()) echo $cmd."\n";
 		$output = null;
-		run_cmd($cmd,$output,1);	// 1 = ignore already up to date database
+		run_cmd($cmd, $output, 1); // 1 = ignore already up to date database
 	}
 	echo "Starting virusscan\n";
 	$cmd = $config['clamscan'].' --quiet -r '.$config['egw_buildroot'];
@@ -1061,12 +1061,12 @@ 
  */
 function do_svncheckout()
 {
-	global $config,$svn;
+	global $config, $svn;
 
 	echo "Starting svn checkout/update\n";
 	if (!file_exists($config['checkoutdir']))
 	{
-		mkdir($config['checkoutdir'],0755,true);
+		mkdir($config['checkoutdir'], 0755, true);
 	}
 	elseif (!is_dir($config['checkoutdir']) || !is_writable($config['checkoutdir']))
 	{
@@ -1081,17 +1081,17 @@ 
 		{
 			get_modules_per_repo();
 		}
-		$config['svntag'] = config_translate('svntag');	// in case svntag command did not run, translate tag name
+		$config['svntag'] = config_translate('svntag'); // in case svntag command did not run, translate tag name
 
 		if (file_exists($config['aliasdir']))
 		{
-			system('/bin/rm -rf .svn '.$config['aliasdir']);	// --> remove the whole checkout, as we dont implement switching tags
+			system('/bin/rm -rf .svn '.$config['aliasdir']); // --> remove the whole checkout, as we dont implement switching tags
 			clearstatcache();
 		}
-		foreach($config['modules'] as $repo => $modules)
+		foreach ($config['modules'] as $repo => $modules)
 		{
 			$cmd = $svn.' co ';
-			foreach($modules as $path => $url)
+			foreach ($modules as $path => $url)
 			{
 				if ($path == $config['aliasdir'])
 				{
@@ -1101,7 +1101,7 @@ 
 					$cmd = $svn.' co ';
 					continue;
 				}
-				if(file_exists($config['aliasdir']))
+				if (file_exists($config['aliasdir']))
 				{
 					die("'egroupware' applications must be first one in externals!\n");
 				}
@@ -1119,16 +1119,16 @@ 
 			// check if correct branch
 			$cmd = 'LANG=C '.$svn.' info';
 			$output = $ret = null;
-			exec($cmd,$output,$ret);
-			foreach($output as $line)
+			exec($cmd, $output, $ret);
+			foreach ($output as $line)
 			{
-				if ($ret || substr($line,0,5) == 'URL: ')
+				if ($ret || substr($line, 0, 5) == 'URL: ')
 				{
-					$url = substr($line,5);
-					if ($ret || substr($url,0,strlen($svnbranch)) != $svnbranch)	// wrong branch (or no svn dir)
+					$url = substr($line, 5);
+					if ($ret || substr($url, 0, strlen($svnbranch)) != $svnbranch)	// wrong branch (or no svn dir)
 					{
 						echo "Checkout is of wrong branch --> deleting it\n";
-						system('/bin/rm -rf .svn '.$config['aliasdir']);	// --> remove the whole checkout
+						system('/bin/rm -rf .svn '.$config['aliasdir']); // --> remove the whole checkout
 						clearstatcache();
 					}
 					break;
@@ -1140,10 +1140,10 @@ 
 		run_cmd($cmd);
 
 		chdir($config['aliasdir']);
-		foreach($config['extra'] as $module)
+		foreach ($config['extra'] as $module)
 		{
-			$module = config_translate(null, $module);	// allow to use config vars like $svnbranch in module
-			$url = strpos($module,'://') === false ? $svnbranch.'/' : '';
+			$module = config_translate(null, $module); // allow to use config vars like $svnbranch in module
+			$url = strpos($module, '://') === false ? $svnbranch.'/' : '';
 			$url .= $module;
 			$cmd = $svn.' co '.$url;
 			run_cmd($cmd);
@@ -1168,7 +1168,7 @@ 
  */
 function get_modules_per_svn_repo()
 {
-	global $config,$svn,$verbose;
+	global $config, $svn, $verbose;
 
 	// process alias/externals
 	$svnbranch = $config['svnbase'].'/'.$config['svnbranch'];
@@ -1176,27 +1176,27 @@ 
 	$cmd = $svn.' propget svn:externals --strict '.$url;
 	if ($verbose) echo $cmd."\n";
 	$output = $ret = null;
-	exec($cmd,$output,$ret);
+	exec($cmd, $output, $ret);
 	$config['modules'] = array();
-	foreach($output as $line)
+	foreach ($output as $line)
 	{
 		$line = trim($line);
 		if (empty($line) || $line[0] == '#') continue;
-		list($path,$url) = preg_split('/[ \t\r\n]+/',$line);
+		list($path, $url) = preg_split('/[ \t\r\n]+/', $line);
 		$matches = null;
-		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];
 		if ($repo == 'http://svn.egroupware.org/egroupware') $repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
 		$config['modules'][$repo][$path] = $url;
 	}
 	// process extra modules
-	foreach($config['extra'] as $module)
+	foreach ($config['extra'] as $module)
 	{
-		$module = config_translate(null, $module);	// allow to use config vars like $svnbranch in module
-		$url = strpos($module,'://') === false ? $svnbranch.'/' : '';
+		$module = config_translate(null, $module); // allow to use config vars like $svnbranch in module
+		$url = strpos($module, '://') === false ? $svnbranch.'/' : '';
 		$url .= $module;
-		if (strpos($module,'://') !== false) $module = basename($module);
-		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die("Invalid SVN URL: $url\n");
+		if (strpos($module, '://') !== false) $module = basename($module);
+		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/', $url, $matches)) die("Invalid SVN URL: $url\n");
 		$repo = $matches[1];
 		if ($repo == 'http://svn.egroupware.org/egroupware') $repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
 		$config['modules'][$repo][$config['aliasdir'].'/'.$module] = $url;
@@ -1210,11 +1210,11 @@ 
  */
 function do_svntag()
 {
-	global $config,$svn;
+	global $config, $svn;
 
-	if (empty($config['svntag'])) return;	// otherwise we copy everything in svn root!
+	if (empty($config['svntag'])) return; // otherwise we copy everything in svn root!
 
-	$config['svntag'] = config_translate('svntag');	// allow to use config vars like $version in tag
+	$config['svntag'] = config_translate('svntag'); // allow to use config vars like $version in tag
 
 	echo "Creating SVN tag $config[svntag]\n";
 	if (!isset($config['modules']))
@@ -1222,9 +1222,9 @@ 
 		get_modules_per_repo();
 	}
 	// create tags (per repo)
-	foreach($config['modules'] as $repo => $modules)
+	foreach ($config['modules'] as $repo => $modules)
 	{
-		$cmd = $svn.' cp --parents -m '.escapeshellarg('Creating '.$config['svntag']).' '.implode(' ',$modules).' '.$repo.'/'.$config['svntag'].'/';
+		$cmd = $svn.' cp --parents -m '.escapeshellarg('Creating '.$config['svntag']).' '.implode(' ', $modules).' '.$repo.'/'.$config['svntag'].'/';
 		run_cmd($cmd);
 	}
 }
@@ -1237,7 +1237,7 @@ 
  * @param int|array $no_bailout =null exit code(s) to NOT bail out
  * @return int exit code of $cmd
  */
-function run_cmd($cmd,array &$output=null,$no_bailout=null)
+function run_cmd($cmd, array &$output = null, $no_bailout = null)
 {
 	global $verbose;
 
@@ -1245,18 +1245,18 @@ 
 	{
 		echo $cmd."\n";
 		$ret = null;
-		system($cmd,$ret);
+		system($cmd, $ret);
 	}
 	else
 	{
 		$output[] = $cmd;
-		exec($cmd,$output,$ret);
-		if ($verbose) echo implode("\n",$output)."\n";
+		exec($cmd, $output, $ret);
+		if ($verbose) echo implode("\n", $output)."\n";
 	}
-	if ($ret && !in_array($ret,(array)$no_bailout))
+	if ($ret && !in_array($ret, (array)$no_bailout))
 	{
-		if (!$verbose) echo implode("\n",$output)."\n";
-		throw new Exception("Error during '$cmd' --> aborting",$ret);
+		if (!$verbose) echo implode("\n", $output)."\n";
+		throw new Exception("Error during '$cmd' --> aborting", $ret);
 	}
 	return $ret;
 }
@@ -1283,7 +1283,7 @@ 
 			return 'NULL';
 		case 'object':
 		case 'array':
-			return str_replace(array("\n",'    '/*,'Array'*/),'',print_r($var,true));
+			return str_replace(array("\n", '    '/*,'Array'*/), '', print_r($var, true));
 	}
 	return 'UNKNOWN TYPE!';
 }
@@ -1293,9 +1293,9 @@ 
  *
  * @param string $error =null optional error-message
  */
-function usage($error=null)
+function usage($error = null)
 {
-	global $prog,$config,$verbose;
+	global $prog, $config, $verbose;
 
 	echo "Usage: $prog [-h|--help] [-v|--verbose] [options, ...]\n\n";
 	echo "options and their defaults:\n";
@@ -1305,12 +1305,12 @@ 
 	}
 	else
 	{
-		unset($config['modules']);	// they give an error, because of nested array and are quite lengthy
+		unset($config['modules']); // they give an error, because of nested array and are quite lengthy
 	}
-	foreach($config as $name => $default)
+	foreach ($config as $name => $default)
 	{
-		if (is_array($default)) $default = json_encode ($default, JSON_UNESCAPED_SLASHES);
-		echo '--'.str_pad($name,20).$default."\n";
+		if (is_array($default)) $default = json_encode($default, JSON_UNESCAPED_SLASHES);
+		echo '--'.str_pad($name, 20).$default."\n";
 	}
 	if ($error)
 	{