From eec0fbb96bdf63c7f3e9ec925cc93c306a5c5d34 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 18 Aug 2022 08:12:07 +0200
Subject: [PATCH] firmware: improve previous a little more

---
 src/opnsense/scripts/firmware/register.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/opnsense/scripts/firmware/register.php b/src/opnsense/scripts/firmware/register.php
index cb3e246df..90475e2b1 100755
--- a/src/opnsense/scripts/firmware/register.php
+++ b/src/opnsense/scripts/firmware/register.php
@@ -2,7 +2,7 @@
 <?php
 
 /*
- * Copyright (c) 2021 Franco Fichtner <franco@opnsense.org>
+ * Copyright (c) 2021-2022 Franco Fichtner <franco@opnsense.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -114,16 +114,19 @@ function plugins_disk_get()
 
     foreach (glob('/usr/local/opnsense/version/*') as $name) {
         $filename = basename($name);
-        if ($filename == 'base' || $filename == 'kernel' || $filename == 'pkgs') {
+        $prefix = explode('.', $filename)[0];
+
+        if ($prefix == 'base' || $prefix == 'kernel' || $prefix == 'pkgs') {
             continue;
         }
+
         $ret = json_decode(@file_get_contents($name), true);
         if ($ret == null || !isset($ret['product_id'])) {
             echo "Ignoring invalid metadata: $name" . PHP_EOL;
             continue;
         }
 
-        if (strpos($filename, 'core') === 0) {
+        if ($prefix == 'core') {
             if (strpos($ret['product_id'], '-') !== false) {
                 $type = preg_replace('/[^-]+-/', '', $ret['product_id']);
             }