diff options
| author | Scott Ullrich <sullrich@gmail.com> | 2012-03-20 05:24:40 -0700 |
|---|---|---|
| committer | Scott Ullrich <sullrich@gmail.com> | 2012-03-20 05:24:40 -0700 |
| commit | 89cb50deb8be69578935249cdd7fa4067ef7923b (patch) | |
| tree | 408a71e98e22c5447ddc3c2f78046fa669de14e6 /etc | |
| parent | fe9ee1e0f3cce0594f61b7ea9e0e9550a55bcdac (diff) | |
| parent | 84d50fe73c78a4034019bbd7906d0bd4b966588b (diff) | |
| download | pfsense-89cb50deb8be69578935249cdd7fa4067ef7923b.zip pfsense-89cb50deb8be69578935249cdd7fa4067ef7923b.tar.gz | |
Merge pull request #65 from phil-davis/master
Bug #2301: Handle case when PBI package names are substrings of each other
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/pkg-utils.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index 8f60e61..7734cc7 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -8,7 +8,7 @@ * $Id$ ****** * - * Copyright (C) 2010 Ermal Luçi + * Copyright (C) 2010 Ermal Lu�i * Copyright (C) 2005-2006 Colin Smith (ethethlay@gmail.com) * All rights reserved. * Redistribution and use in source and binary forms, with or without @@ -794,11 +794,11 @@ function install_package_xml($pkg) { * change packages to store configs at /usr/pbi/pkg/etc and remove this */ eval_once($pkg_config['custom_php_install_command']); - exec("/usr/local/sbin/pbi_info | grep {$pkg} | xargs /usr/local/sbin/pbi_info | awk '/Prefix/ {print $2}'",$pbidir); - $pbidir = $pbidir[0]; + exec("/usr/local/sbin/pbi_info | grep {$pkg}- | xargs /usr/local/sbin/pbi_info | awk '/Prefix/ {print $2}'",$pbidirarray); + $pbidir0 = $pbidirarray[0]; exec("find /usr/local/etc/ -name *.conf | grep {$pkg}",$files); foreach($files as $f) { - $pbiconf = str_replace('/usr/local',$pbidir,$f); + $pbiconf = str_replace('/usr/local',$pbidir0,$f); unlink($pbiconf); symlink($f,$pbiconf); } |
