makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-19 09:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3986 from CHItA/ticket/14240

Browse source 
[ticket/14240] Fix packaging script for 3.2

* CHItA/ticket/14240:
  [ticket/14240] Fix packaging script for 3.2
This commit is contained in:
Tristan Darricau 2015-10-17 15:40:43 +02:00
commit 59d39dce3b
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
build/package.php
View file

@ -196,9 +196,10 @@ if (sizeof($package->old_packages))
*/ */
$copy_relative_directories = array( $copy_relative_directories = array(
'config/' => array( 'config/' => array(
'recursive' => true,
'copied' => false, 'copied' => false,
'copy' => array( 'copy' => array(
'config/*.yml' => 'config', 'config/*' => 'config',
), ),
), ),
); );
@ -256,8 +257,16 @@ if (sizeof($package->old_packages))
} }
$source_dir_files = $package->locations['old_versions'] . $package->get('simple_name') . '/' . $source_dir_files; $source_dir_files = $package->locations['old_versions'] . $package->get('simple_name') . '/' . $source_dir_files;
$destination_dir = $dest_filename_dir . '/install/update/new/' . $destination_dir; $destination_dir = $dest_filename_dir . '/install/update/new/' . $destination_dir;
if (isset($data['recursive']) && $data['recursive'])
{
$package->run_command('cp -Rp ' . $source_dir_files . ' ' . $destination_dir);
}
else
{
$package->run_command('cp ' . $source_dir_files . ' ' . $destination_dir); $package->run_command('cp ' . $source_dir_files . ' ' . $destination_dir);
} }
}
$copy_relative_directories[$reference]['copied'] = true; $copy_relative_directories[$reference]['copied'] = true;
} }
} }

1
phpBB/config/default/config.yml
View file

@ -0,0 +1 @@
# phpBB's config file (This line is needed because of the packager)