diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2015-10-15 18:24:41 +0200 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-10-15 18:24:41 +0200 |
| commit | f6171f03917a632396053ec6a459996d84794fff (patch) | |
| tree | 03da36baffe129f7a481d60b464e880d00f430e5 /build/package.php | |
| parent | 2974353101ae60dc13f0de938920765d7a78dc95 (diff) | |
| download | forums-f6171f03917a632396053ec6a459996d84794fff.tar forums-f6171f03917a632396053ec6a459996d84794fff.tar.gz forums-f6171f03917a632396053ec6a459996d84794fff.tar.bz2 forums-f6171f03917a632396053ec6a459996d84794fff.tar.xz forums-f6171f03917a632396053ec6a459996d84794fff.zip | |
[ticket/14240] Fix packaging script for 3.2
PHPBB3-14240
Diffstat (limited to 'build/package.php')
| -rwxr-xr-x | build/package.php | 13 |
1 files changed, 11 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; } |