diff options
| author | Colin Smith <colin@pfsense.org> | 2005-04-12 13:45:12 +0000 |
|---|---|---|
| committer | Colin Smith <colin@pfsense.org> | 2005-04-12 13:45:12 +0000 |
| commit | 449a26944f26fa30aaa9643e9a6bd43ee6ce6ff1 (patch) | |
| tree | a98a3839dfbf2f1ec58a0463a5573e94427575fd /usr | |
| parent | f6f48dde3d0af53f6b570107af63fcac46083a08 (diff) | |
| download | pfsense-449a26944f26fa30aaa9643e9a6bd43ee6ce6ff1.zip pfsense-449a26944f26fa30aaa9643e9a6bd43ee6ce6ff1.tar.gz | |
* Minor cleanup.
* Log pkg_add output in pkg_fetch_recursive.
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/local/www/guiconfig.inc | 6 | ||||
| -rwxr-xr-x | usr/local/www/pkg_mgr_install.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc index 1f92e45..d76bab3 100755 --- a/usr/local/www/guiconfig.inc +++ b/usr/local/www/guiconfig.inc @@ -571,7 +571,7 @@ function read_body($ch, $string) { } function pkg_fetch_recursive($pkgname, $filename, $dependlevel = 0, $base_url = 'http://ftp2.freebsd.org/pub/FreeBSD/ports/i386/packages-5-stable/Latest') { - global $static_status, $static_output, $g; + global $static_status, $static_output, $g, $fd_log; $pkg_extension = strrchr($filename, '.'); $static_output .= "\n" . str_repeat(" ", $dependlevel * 2) . $pkgname . " "; $fetchto = "/tmp/apkg_" . $pkgname . $pkg_extension; @@ -591,8 +591,8 @@ function pkg_fetch_recursive($pkgname, $filename, $dependlevel = 0, $base_url = if($is_installed[0] == "") pkg_fetch_recursive($working_depend[0], $depend_filename, $dependlevel + 1); } } - mwexec("cat {$g['tmp_path']}/y | /usr/sbin/pkg_add {$fetchto}"); + exec("cat {$g['tmp_path']}/y | /usr/sbin/pkg_add {$fetchto}", $pkgaddout); + fwrite($fd_log, $pkgname . print_r($pkgaddout, true) . "\n"); return true; } - ?> diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php index 412c726..477702c 100755 --- a/usr/local/www/pkg_mgr_install.php +++ b/usr/local/www/pkg_mgr_install.php @@ -330,7 +330,7 @@ foreach ($packages_to_install as $id) { /* * parse the config file for this package and install neededtext items. * - */ + */ if(file_exists("/usr/local/pkg/" . $pkgent['name'] . ".xml")) { $package_conf = parse_xml_config_pkg("/usr/local/pkg/" . $pkgent['name'] . ".xml", "packagegui"); if($package_conf['modify_system']['item'] <> "") { @@ -356,7 +356,7 @@ foreach ($packages_to_install as $id) { $afn_count = count($package_conf['additional_files_needed']) -1; foreach($package_conf['additional_files_needed'] as $afn) { $filename = get_filename_from_url($afn['item'][0]); - fwrite($fd_log, "Downloading additional files needed for package " . $filename . " ...\n"); + fwrite($fd_log, "Downloading additional files needed for package " . $filename . "...\n"); if ($i == $afn_count) { $static_orig = $static_output . $filename . ".\n"; } else { |
