* Fix skip_install_checks.

* Loosen up pattern matching on /var/db/pkg. This is not an ideal solution.

1 files changed, 3 insertions, 3 deletions

diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php
index 6c13351..ecfa4e1 100755
--- a/usr/local/www/pkg_mgr_install.php
+++ b/usr/local/www/pkg_mgr_install.php
@@ -279,9 +279,9 @@ foreach ($packages_to_install as $id) {
 		update_output_window($static_output);
 		exec("ls /var/db/pkg", $is_installed);
                 $pkg_installed = false;
-		if(isset($pkgent['skip_install_checks'])) $pkg_installed = true;
+		if(isset($pkg_config['packages']['package'][$id]['skip_install_checks'])) $pkg_installed = true;
                 foreach($is_installed as $is_inst) {
-                	if($is_inst == $pkgent['name'] . '-' . $pkgent['version']) {
+                	if(array_shift(explode('-', $is_inst)) == $pkgent['name']) {
                 		$pkg_installed = true;
                 		break;
                 	}
@@ -297,7 +297,7 @@ foreach ($packages_to_install as $id) {
         if($pkg_installed == false) {
 		exec("ls /var/db/pkg", $is_installed);
 		foreach($is_installed as $is_inst) {
-                         if($is_inst == $pkgent['name'] . '-' . $pkgent['version']) {
+                         if(array_shift(explode('-', $is_inst)) == $pkgent['name']) {
                                  $pkg_installed = true;
                                  break;
                          }