diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-17 15:40:43 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-17 15:40:43 +0200 |
| commit | 59d39dce3b0936dc5aee6af6242c506acf17783b (patch) | |
| tree | ab2070be68d31411ccb59d734d3b2cc6b2e3fb9f | |
| parent | a928b109d39b2c481b8de13d5790ec68190abab5 (diff) | |
| parent | f6171f03917a632396053ec6a459996d84794fff (diff) | |
| download | forums-59d39dce3b0936dc5aee6af6242c506acf17783b.tar forums-59d39dce3b0936dc5aee6af6242c506acf17783b.tar.gz forums-59d39dce3b0936dc5aee6af6242c506acf17783b.tar.bz2 forums-59d39dce3b0936dc5aee6af6242c506acf17783b.tar.xz forums-59d39dce3b0936dc5aee6af6242c506acf17783b.zip | |
Merge pull request #3986 from CHItA/ticket/14240
[ticket/14240] Fix packaging script for 3.2
* CHItA/ticket/14240:
[ticket/14240] Fix packaging script for 3.2
| -rwxr-xr-x | build/package.php | 13 | ||||
| -rw-r--r-- | phpBB/config/default/config.yml | 1 |
2 files changed, 12 insertions, 2 deletions
diff --git a/build/package.php b/build/package.php index 37a2250fce..5b5f6fdfea 100755 --- a/build/package.php +++ b/build/package.php @@ -196,9 +196,10 @@ if (sizeof($package->old_packages)) */ $copy_relative_directories = array( 'config/' => array( + 'recursive' => true, 'copied' => false, 'copy' => array( - 'config/*.yml' => 'config', + 'config/*' => 'config', ), ), ); @@ -256,7 +257,15 @@ if (sizeof($package->old_packages)) } $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); + + 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); + } } $copy_relative_directories[$reference]['copied'] = true; } diff --git a/phpBB/config/default/config.yml b/phpBB/config/default/config.yml index e69de29bb2..e8d0536287 100644 --- a/phpBB/config/default/config.yml +++ b/phpBB/config/default/config.yml @@ -0,0 +1 @@ +# phpBB's config file (This line is needed because of the packager) |