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

[ticket/12030] Fix wrong file and directory names

Browse source 
PHPBB3-12030
This commit is contained in:
Joas Schilling 2013-12-19 16:40:30 +01:00
parent 4429022b98
commit df61389238
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build/package.php
View file

@ -206,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
@ -230,15 +232,15 @@ if (sizeof($package->old_packages))
foreach ($copy_relative_directories as $reference => $data) foreach ($copy_relative_directories as $reference => $data)
{ {
// Copy all relative referenced files if needed // Copy all relative referenced files if needed
if (strpos($file, $reference) === 0 && !$data['copied']) if (strpos($filename, $reference) === 0 && !$data['copied'])
{ {
foreach ($data['copy'] as $source_dir_files => $destination_dir) foreach ($data['copy'] as $source_dir_files => $destination_dir)
{ {
// Create Directories along the way? // Create Directories along the way?
$directories = explode('/', $directory); $directories = explode('/', $destination_dir);
chdir($dest_filename_dir . '/install/update/new'); chdir($dest_filename_dir . '/install/update/new');
foreach ($destination_dir as $dir) foreach ($directories as $dir)
{ {
$dir = trim($dir); $dir = trim($dir);
if ($dir) if ($dir)
@ -252,7 +254,6 @@ 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;
$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;