Revision 8a9e047d
Added by Scott Ullrich over 20 years ago
| usr/local/www/pkg_mgr_install.php | ||
|---|---|---|
| 289 | 289 |
fwrite($fd_log, "cd /tmp/ && /usr/sbin/pkg_add -r " . $pkgent['depends_on_package_base_url'] . "/" . $pkgent['depends_on_package'] . "\n" . $text);; |
| 290 | 290 |
} |
| 291 | 291 |
|
| 292 |
$status = exec_command_and_return_text("ls /var/db/pkg | grep " . $pkgent['name']);
|
|
| 293 |
fwrite($fd_log, "ls /var/db/pkg | grep " . $pkgent['name'] . "\n" . $status); |
|
| 294 |
if($status <> "") {
|
|
| 295 |
update_status("Package installed. Lets finish up.");
|
|
| 296 |
fwrite($fd_log, "Package installed. Lets finish up.\n"); |
|
| 297 |
} else {
|
|
| 298 |
fwrite($fd_log, "Package WAS NOT installed properly.\n"); |
|
| 299 |
fclose($fd_log); |
|
| 300 |
$filecontents = exec_command_and_return_text("cat " . $file);
|
|
| 301 |
update_progress_bar(100); |
|
| 302 |
echo "\n<script language=\"JavaScript\">document.progressbar.style.visibility='hidden';</script>"; |
|
| 303 |
echo "\n<script language=\"JavaScript\">document.progholder.style.visibility='hidden';</script>"; |
|
| 304 |
update_status("Package WAS NOT installed properly...Something went wrong..\n" . $filecontents);
|
|
| 305 |
update_output_window("Error during package installation.");
|
|
| 306 |
sleep(1); |
|
| 307 |
die; |
|
| 292 |
if ($pkgent['depends_on_package_base_url'] <> "" or $pkgent['pfsense_package_base_url'] <> "") {
|
|
| 293 |
$status = exec_command_and_return_text("ls /var/db/pkg | grep " . $pkgent['name']);
|
|
| 294 |
fwrite($fd_log, "ls /var/db/pkg | grep " . $pkgent['name'] . "\n" . $status); |
|
| 295 |
if($status <> "") {
|
|
| 296 |
update_status("Package installed. Lets finish up.");
|
|
| 297 |
fwrite($fd_log, "Package installed. Lets finish up.\n"); |
|
| 298 |
} else {
|
|
| 299 |
fwrite($fd_log, "Package WAS NOT installed properly.\n"); |
|
| 300 |
fclose($fd_log); |
|
| 301 |
$filecontents = exec_command_and_return_text("cat " . $file);
|
|
| 302 |
update_progress_bar(100); |
|
| 303 |
echo "\n<script language=\"JavaScript\">document.progressbar.style.visibility='hidden';</script>"; |
|
| 304 |
echo "\n<script language=\"JavaScript\">document.progholder.style.visibility='hidden';</script>"; |
|
| 305 |
update_status("Package WAS NOT installed properly...Something went wrong..\n" . $filecontents);
|
|
| 306 |
update_output_window("Error during package installation.");
|
|
| 307 |
sleep(1); |
|
| 308 |
die; |
|
| 309 |
} |
|
| 308 | 310 |
} |
| 309 | 311 |
|
| 310 | 312 |
update_progress_bar($pb_percent); |
| ... | ... | |
| 408 | 410 |
update_progress_bar($pb_percent); |
| 409 | 411 |
$pb_percent += 10; |
| 410 | 412 |
|
| 411 |
$status = exec_command_and_return_text("ls /var/db/pkg | grep " . $pkgent['name']);
|
|
| 412 |
fwrite($fd_log, "ls /var/db/pkg | grep " . $pkgent['name'] . "\n" . $status); |
|
| 413 |
if($status <> "") {
|
|
| 414 |
update_status("Package installation completed.");
|
|
| 415 |
fwrite($fd_log, "Package installation completed.\n"); |
|
| 413 |
if ($pkgent['depends_on_package_base_url'] <> "" or $pkgent['pfsense_package_base_url'] <> "") {
|
|
| 414 |
$status = exec_command_and_return_text("ls /var/db/pkg | grep " . $pkgent['name']);
|
|
| 415 |
fwrite($fd_log, "ls /var/db/pkg | grep " . $pkgent['name'] . "\n" . $status); |
|
| 416 |
if($status <> "") {
|
|
| 417 |
update_status("Package installation completed.");
|
|
| 418 |
fwrite($fd_log, "Package installation completed.\n"); |
|
| 419 |
} else {
|
|
| 420 |
update_status("Package WAS NOT installed properly.");
|
|
| 421 |
fwrite($fd_log, "Package WAS NOT installed properly.\n"); |
|
| 422 |
} |
|
| 416 | 423 |
} else {
|
| 417 |
update_status("Package WAS NOT installed properly.");
|
|
| 418 |
fwrite($fd_log, "Package WAS NOT installed properly.\n");
|
|
| 424 |
update_status("Package installation completed.");
|
|
| 425 |
fwrite($fd_log, "Package installation completed.\n");
|
|
| 419 | 426 |
} |
| 420 | 427 |
|
| 421 | 428 |
update_progress_bar($pb_percent); |
Also available in: Unified diff
If a package does not list any packages needed do not check to make sure its installed.