Firmware upgrade changes

src/opnsense/scripts/pkg_updatecheck.sh

@@ -129,6 +129,7 @@ if [ "$pkg_running" == "" ]; then
                     if [ "`echo $i | grep ':'`" == "" ]; then
                       itemcount=0 # This is not a valid item so reset item count
                     else
+                      i=`echo $i | tr -d :`
                       #echo "name:$i"
                       if [ "$packages_new" == "" ]; then 
                         packages_new=$packages_new"{\"name\":\"$i\"," # If it is the first item then we do not want a seperator
@@ -155,6 +156,7 @@ if [ "$pkg_running" == "" ]; then
                     if [ "`echo $i | grep ':'`" == "" ]; then
                       itemcount=0 # This is not a valid item so reset item count
                     else
+                      i=`echo $i | tr -d :`
                       if [ "$packages_upgraded" == "" ]; then 
                         packages_upgraded=$packages_upgraded"{\"name\":\"$i\"," # If it is the first item then we do not want a seperator
                       else

src/opnsense/scripts/pkg_upgrade.sh

+#!/bin/sh
+pkg upgrade -y > /tmp/pkg_upgrade.progress
+echo '***DONE***' >> /tmp/pkg_upgrade.progress
+rm /tmp/pkg_upgrade.progress
+

src/www/widgets/widgets/system_information.widget.php

@@ -59,7 +59,7 @@ if($_REQUEST['getupdatestatus']) {
 		} elseif  ($pkg_status["updates"]=="0") {
 			echo "<span class='text-info'>".gettext("At")." <small>".$pkg_status["last_check"]."</small>".gettext(" no updates found.")."<br/><span class='btn-link' onclick='checkupdate()'>Click to check now</span>";
 		} else {
-			echo "<span class='text-danger'>".gettext("A total of ").$pkg_status["updates"].gettext(" update(s) are available.")."</span><br/><a href='/system_firmware.php'>".gettext("Click to update")."</a>";
+			echo "<span class='text-danger'>".gettext("A total of ").$pkg_status["updates"].gettext(" update(s) are available.")."</span><br/><a href='/system_firmware_check.php'>".gettext("Click to update")."</a>";
 		}
 	} else {
 		echo "<span class='text-danger'>".gettext("Unknown")."</span><br/><span class='btn-link' onclick='checkupdate()'>".gettext("Click to check now")."</span>";