makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1936 from nickvergessen/ticket/12030

Browse source 
[Ticket/12030] Include some directories completly in update packages
This commit is contained in:
Nils Adermann 2014-01-12 02:31:40 -08:00
commit 46fec7ee90
1 changed files with 54 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
build/package.php
View file

@ -174,6 +174,27 @@ if (sizeof($package->old_packages))
$package->run_command('cp ' . $source_filename . ' ' . $dest_filename); $package->run_command('cp ' . $source_filename . ' ' . $dest_filename);
} }
/**
* We try to keep the update packages as small as possible while creating them.
* However, we sometimes need to include additional files that are not included
* in the diff in order to be able to correctly include the relatively
* referenced files from the same or subsequent directories.
*/
$copy_relative_directories = array(
'adm/style/admin.css' => array(
'copied' => false,
'copy' => array(
'adm/images/*' => 'adm/images',
),
),
'config/' => array(
'copied' => false,
'copy' => array(
'config/*.yml' => 'config',
),
),
);
// Then fill the 'new' directory // Then fill the 'new' directory
foreach ($file_contents['all'] as $file) foreach ($file_contents['all'] as $file)
{ {
@ -185,6 +206,8 @@ if (sizeof($package->old_packages))
continue; continue;
} }
$filename = $file;
// Create Directories along the way? // Create Directories along the way?
$file = explode('/', $file); $file = explode('/', $file);
// Remove filename portion // Remove filename portion
@ -205,6 +228,37 @@ if (sizeof($package->old_packages))
} }
$package->run_command('cp ' . $source_filename . ' ' . $dest_filename); $package->run_command('cp ' . $source_filename . ' ' . $dest_filename);
foreach ($copy_relative_directories as $reference => $data)
{
// Copy all relative referenced files if needed
if (strpos($filename, $reference) === 0 && !$data['copied'])
{
foreach ($data['copy'] as $source_dir_files => $destination_dir)
{
// Create directories along the way?
$directories = explode('/', $destination_dir);
chdir($dest_filename_dir . '/install/update/new');
foreach ($directories as $dir)
{
$dir = trim($dir);
if ($dir)
{
if (!file_exists('./' . $dir))
{
$package->run_command('mkdir ' . $dir);
}
chdir('./' . $dir);
}
}
$source_dir_files = $package->locations['old_versions'] . $package->get('simple_name') . '/' . $source_dir_files;
$destination_dir = $dest_filename_dir . '/install/update/new/' . $destination_dir;
$package->run_command('cp ' . $source_dir_files . ' ' . $destination_dir);
}
$copy_relative_directories[$reference]['copied'] = true;
}
}
} }
// Build index.php file for holding the file structure // Build index.php file for holding the file structure