extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 04:41:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

also list channels to not attempt to install already installed channel packages

Browse Source
This commit is contained in:
Ralf Becker 2014-04-18 09:00:22 +00:00
parent 30ae4474dd
commit 90d2c68139
1 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
doc/rpm-build/post_install.php
View File

@ -527,14 +527,22 @@ function usage($error=null)
} }
/** /**
* Check if required PEAR packges are installed and install them if not, update pear packages with to low version * Get installed pear packages, optional from a certain channel
*
* @global type $config
* @param string $channel=''
* @return null|array with package => version
*/ */
function check_install_pear_packages() function pear_list($channel='')
{ {
global $config; global $config;
$out = $ret = null; $out = $ret = null;
exec($config['pear'].' list',$out,$ret); exec($config['pear'].' list'.($channel?' -c '.$channel:''),$out,$ret);
if ($channel && $ret == 1)
{
return null;
}
if ($ret) if ($ret)
{ {
echo "Error running pear command ($config[pear])!\n"; echo "Error running pear command ($config[pear])!\n";
@ -546,11 +554,23 @@ function check_install_pear_packages()
$matches = null; $matches = null;
if (preg_match('/^([a-z0-9_]+)\s+([0-9.]+[a-z0-9]*)\s+([a-z]+)/i',$line,$matches)) if (preg_match('/^([a-z0-9_]+)\s+([0-9.]+[a-z0-9]*)\s+([a-z]+)/i',$line,$matches))
{ {
$packages_installed[$matches[1]] = $matches[2]; $packages_installed[($channel?$channel.'/':'').$matches[1]] = $matches[2];
} }
} }
return $packages_installed;
}
/**
* Check if required PEAR packges are installed and install them if not, update pear packages with to low version
*/
function check_install_pear_packages()
{
global $config;
$packages_installed = pear_list();
// read required packages from apps // read required packages from apps
$packages = array('PEAR' => true, 'HTTP_WebDAV_Server' => '999.egw-pear'); // pear must be the first, to run it's update first! $packages = array('PEAR' => true, 'HTTP_WebDAV_Server' => '999.egw-pear'); // pear must be the first, to run it's update first!
$channels = array();
$egw_pear_packages = array(); $egw_pear_packages = array();
$setup_info = array(); $setup_info = array();
foreach(scandir($config['source_dir']) as $app) foreach(scandir($config['source_dir']) as $app)
@ -566,6 +586,24 @@ function check_install_pear_packages()
if ($args['func'] == 'pear_check') if ($args['func'] == 'pear_check')
{ {
if (!$package) $package = 'PEAR'; if (!$package) $package = 'PEAR';
// if package is prefixed with a channel, list or discover it first
if (strpos($package, '/'))
{
list($channel) = explode('/', $package);
if (!in_array($channel, $channels))
{
if (($channel_packages = pear_list($channel)))
{
$packages_installed += $channel_packages;
}
else
{
$discover_cmd = $config['pear'].' channel-discover '.$channel;
echo "$discover_cmd\n"; system($discover_cmd);
}
$channels[] = $channel;
}
}
// only overwrite lower version or no version // only overwrite lower version or no version
if (!isset($packages[$package]) || $packages[$package] === true || isset($args['version']) && version_compare($args['version'],$packages[$package],'>')) if (!isset($packages[$package]) || $packages[$package] === true || isset($args['version']) && version_compare($args['version'],$packages[$package],'>'))
{ {
@ -619,23 +657,7 @@ function check_install_pear_packages()
} }
if ($to_install) if ($to_install)
{ {
$channels = array(); $cmd = $config['pear'].' install '.implode(' ', $to_install);
$cmd = $config['pear'].' install';
foreach($to_install as $package)
{
// if package is prefixed with a channel, discover it before installing package
if (strpos($package, '/') !== false)
{
list($channel) = explode('/', $package);
if (!in_array($channel, $channels))
{
$discover_cmd = $config['pear'].' channel-discover '.$channel;
echo "$discover_cmd\n"; system($discover_cmd);
$channels[] = $channel;
}
}
$cmd .= ' '.$package;
}
echo "$cmd\n"; system($cmd); echo "$cmd\n"; system($cmd);
} }
} }