mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

CORRECTLY use verifyinstalledpkg tag if defined

Browse Source
This commit is contained in:
Scott Ullrich 2005-02-27 20:51:18 +00:00
parent 3059e7ee62
commit 960e4d4f80
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr/local/www/pkg_mgr_install.php
View File

@ -183,6 +183,12 @@ foreach ($packages_to_install as $id) {
$pb_percent += 10;
$a_out = &$pkg_config['packages']['package'];
if($pkg_config['packages']['package'][$id]['verifyinstalledpkg'] <> "")
$package_to_verify = $pkg_config['packages']['package'][$id]['verifyinstalledpkg'];
else
$package_to_verify = $pkg_config['packages']['package'][$id]['name'];
$pkgent = array();
$pkgent['name'] = $pkg_config['packages']['package'][$id]['name'];
$pkgent['descr'] = $pkg_config['packages']['package'][$id]['descr'];
@ -213,7 +219,7 @@ foreach ($packages_to_install as $id) {
update_progress_bar($pb_percent);
$pb_percent += 10;
fwrite($fd_log, "ls /var/db/pkg | grep " . $pkgent['name'] . "\n" . $status);
fwrite($fd_log, "ls /var/db/pkg | grep " . $package_to_verify . "\n" . $status);
if($status <> "") {
// package is already installed!?
if(!$_GET['mode'] == "reinstallall")
@ -268,8 +274,8 @@ foreach ($packages_to_install as $id) {
}
if ($pkgent['depends_on_package_base_url'] <> "" or $pkgent['pfsense_package_base_url'] <> "") {
$status = exec_command_and_return_text("ls /var/db/pkg | grep " . $pkgent['name']);
fwrite($fd_log, "ls /var/db/pkg | grep " . $pkgent['name'] . "\n" . $status);
$status = exec_command_and_return_text("ls /var/db/pkg | grep " . $package_to_verify);
fwrite($fd_log, "ls /var/db/pkg | grep " . $package_to_verify . "\n" . $status);
if($status <> "") {
update_status("Package installed. Lets finish up.");
fwrite($fd_log, "Package installed. Lets finish up.\n");
@ -414,19 +420,19 @@ foreach ($packages_to_install as $id) {
update_progress_bar($pb_percent);
if ($pkgent['depends_on_package_base_url'] <> "" or $pkgent['pfsense_package_base_url'] <> "") {
$package_to_verify = $pkgent['name'];
if($pkgent['verifyinstalledpkg'] <> "")
$package_to_verify = $pkgent['verifyinstalledpkg'];
$status = exec_command_and_return_text("ls /var/db/pkg | grep " . $package_to_verify);
fwrite($fd_log, "ls /var/db/pkg | grep " . $package_to_verify . "\n" . $status);
if($status <> "") {
update_status("Package installation completed.");
fwrite($fd_log, "Package installation completed.\n");
log_error("Package " . $pkgent['name'] . " installation completed okay.");
update_progress_bar(100);
} else {
update_status("Package WAS NOT installed properly.");
update_output_window("Package WAS NOT installed properly.");
fwrite($fd_log, "Package WAS NOT installed properly.\n");
log_error("Package " . $pkgent['name'] . " did not install correctly.");
update_progress_bar(100);
}
} else {
update_status("Package installation completed.");