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

Abort installation when pbi_add fails

Browse Source
This commit is contained in:
Renato Botelho 2014-02-13 09:31:58 -02:00
parent 8f38bc5716
commit 6635f5b90d
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
etc/inc/pkg-utils.inc
View File

@ -567,21 +567,30 @@ function pkg_fetch_recursive($pkgname, $filename, $dependlevel = 0, $base_url =
if (isset($config['system']['pkg_nochecksig']))
$no_checksig = "--no-checksig";
exec("/usr/local/sbin/pbi_add " . $pkgstaging . " -f -v {$no_checksig} " . escapeshellarg($fetchto) . " 2>&1", $pkgaddout);
pkg_debug($pkgname . " " . print_r($pkgaddout, true) . "\npbi_add successfully completed.\n");
setup_library_paths();
exec("/usr/local/sbin/pbi_info " . escapeshellarg(preg_replace('/\.pbi$/','',$filename)) . " | /usr/bin/awk '/Prefix/ {print $2}'",$pbidir);
$pbidir = $pbidir[0];
$linkdirs = array('bin','sbin');
foreach($linkdirs as $dir) {
if(is_dir("{$pbidir}/{$dir}")) {
exec("/usr/local/sbin/pbi_add " . $pkgstaging . " -f -v {$no_checksig} " . escapeshellarg($fetchto) . " 2>&1", $pkgaddout, $rc);
pkg_debug($pkgname . " " . print_r($pkgaddout, true) . "\n");
if ($rc == 0) {
setup_library_paths();
exec("/usr/local/sbin/pbi_info " . escapeshellarg(preg_replace('/\.pbi$/','',$filename)) . " | /usr/bin/awk '/Prefix/ {print $2}'",$pbidir);
$pbidir = $pbidir[0];
foreach(array('bin', 'sbin') as $dir) {
if(!is_dir("{$pbidir}/{$dir}"))
continue;
$files = scandir("{$pbidir}/{$dir}");
foreach($files as $f) {
if(!file_exists("/usr/local/{$dir}/{$f}")) {
symlink("{$pbidir}/{$dir}/{$f}","/usr/local/{$dir}/{$f}");
}
}
foreach($files as $f)
if(!file_exists("/usr/local/{$dir}/{$f}"))
@symlink("{$pbidir}/{$dir}/{$f}","/usr/local/{$dir}/{$f}");
}
pkg_debug("pbi_add successfully completed.\n");
} else {
if (is_array($pkgaddout))
foreach ($pkgaddout as $line)
$static_output .= " " . $line .= "\n";
update_output_window($static_output);
pkg_debug("pbi_add failed.\n");
return false;
}
}
return true;