Revision b2b15543
Added by Scott Ullrich over 14 years ago
| etc/inc/pkg-utils.inc | ||
|---|---|---|
| 335 | 335 |
// Restore libraries that we backed up |
| 336 | 336 |
$static_output .= "Cleaning up... "; |
| 337 | 337 |
update_output_window($static_output); |
| 338 |
exec("/usr/bin/tar xzPf /tmp/pkg_libs.tgz -C /");
|
|
| 338 |
exec("/usr/bin/tar xzPfU /tmp/pkg_libs.tgz -C /");
|
|
| 339 | 339 |
@unlink("/tmp/pkg_libs.tgz");
|
| 340 | 340 |
} |
| 341 | 341 |
|
| ... | ... | |
| 480 | 480 |
if (pkg_fetch_recursive($working_depend[1], $depend_filename, $dependlevel + 1, $base_url) == false) |
| 481 | 481 |
return false; |
| 482 | 482 |
} else {
|
| 483 |
//$dependlevel++; |
|
| 484 |
//$static_output .= "\n" . str_repeat(" ", $dependlevel * 2) . $working_depend[1] . " already installed.";
|
|
| 485 | 483 |
pkg_debug($working_depend[1] . "\n"); |
| 486 | 484 |
} |
| 487 | 485 |
} |
| ... | ... | |
| 683 | 681 |
if(!is_dir($prefix)) |
| 684 | 682 |
safe_mkdir($prefix); |
| 685 | 683 |
$static_output .= $filename . " "; |
| 686 |
update_output_window($static_output);
|
|
| 684 |
update_output_window($static_output);
|
|
| 687 | 685 |
if (download_file_with_progress_bar($afn['item'][0], $prefix . $filename) !== true) {
|
| 688 | 686 |
$static_output .= "failed.\n"; |
| 689 | 687 |
update_output_window($static_output); |
| ... | ... | |
| 1003 | 1001 |
update_output_window($static_output); |
| 1004 | 1002 |
} |
| 1005 | 1003 |
if($pkg_config['include_file'] <> "") {
|
| 1006 |
$static_output .= "Removing package instructions...";
|
|
| 1007 |
update_output_window($static_output);
|
|
| 1008 |
pkg_debug("Remove '{$pkg_config['include_file']}'\n");
|
|
| 1009 |
unlink_if_exists("/usr/local/pkg/" . $pkg_config['include_file']);
|
|
| 1004 |
$static_output .= "Removing package instructions...";
|
|
| 1005 |
update_output_window($static_output);
|
|
| 1006 |
pkg_debug("Remove '{$pkg_config['include_file']}'\n");
|
|
| 1007 |
unlink_if_exists("/usr/local/pkg/" . $pkg_config['include_file']);
|
|
| 1010 | 1008 |
$static_output .= "done.\n"; |
| 1011 |
update_output_window($static_output); |
|
| 1012 |
|
|
| 1013 |
} |
|
| 1009 |
update_output_window($static_output); |
|
| 1010 |
} |
|
| 1014 | 1011 |
/* remove all additional files */ |
| 1015 | 1012 |
if(is_array($pkg_config['additional_files_needed'])) {
|
| 1016 | 1013 |
$static_output .= "Auxiliary files... "; |
| ... | ... | |
| 1021 | 1018 |
$prefix = $afn['prefix']; |
| 1022 | 1019 |
else |
| 1023 | 1020 |
$prefix = "/usr/local/pkg/"; |
| 1024 |
|
|
| 1025 | 1021 |
unlink_if_exists($prefix . $filename); |
| 1026 | 1022 |
} |
| 1027 | 1023 |
$static_output .= "done.\n"; |
Also available in: Unified diff
Need to use Unlink in tar