diff --git a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt index 65cadad46..7224f31a8 100644 --- a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt +++ b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt @@ -111,7 +111,7 @@ POSSIBILITY OF SUCH DAMAGE. $('#updatelist').hide(); $('#update_status').show(); $('#updatetab > a').tab('show'); - $('#updatestatus').html("{{ lang._('Upgrading...') }}"); + $('#updatestatus').html("{{ lang._('Upgrading, please wait...') }}"); $("#audit").attr("style","display:none"); maj_suffix = ''; if ($.upgrade_action == 'maj') { @@ -134,7 +134,7 @@ POSSIBILITY OF SUCH DAMAGE. $('#updatelist').hide(); $('#update_status').show(); $('#updatetab > a').tab('show'); - $('#updatestatus').html("{{ lang._('Auditing...') }}"); + $('#updatestatus').html("{{ lang._('Auditing, please wait...') }}"); $("#audit").attr("style",""); $("#audit_progress").addClass("fa fa-spinner fa-pulse"); @@ -203,7 +203,7 @@ POSSIBILITY OF SUCH DAMAGE. $('#updatelist').hide(); $('#update_status').show(); $('#updatetab > a').tab('show'); - $('#updatestatus').html("{{ lang._('Executing...') }}"); + $('#updatestatus').html("{{ lang._('Executing, please wait...') }}"); $.upgrade_action = 'action'; ajaxCall('/api/core/firmware/'+pkg_act+'/'+pkg_name,{},function() { diff --git a/src/opnsense/scripts/firmware/check.sh b/src/opnsense/scripts/firmware/check.sh index 6acdc169f..4c0b8d859 100755 --- a/src/opnsense/scripts/firmware/check.sh +++ b/src/opnsense/scripts/firmware/check.sh @@ -30,8 +30,7 @@ # repository: error|ok # last_ckeck: # updates: <#num_of_updates> -# download_size: none| -# extra_space_required: none| +# download_size: unknown| # new_packages: array with { name: , version: } # reinstall_packages: array with { name: , version: } # upgrade_packages: array with { name: , current_version: , new_version: } @@ -51,8 +50,7 @@ last_check="unknown" packages_upgraded="" packages_downgraded="" packages_new="" -required_space="none" -download_size="none" +download_size="unknown" itemcount=0 linecount=0 timer=0 @@ -109,13 +107,9 @@ if [ "$pkg_running" == "" ]; then # There are no updates updates="0" else - required_space=`cat $tmp_pkg_output_file | grep 'The process will require' | awk -F '[ ]' '{print $5$6}'` - if [ "$required_space" == "" ]; then - required_space="none" - fi download_size=`cat $tmp_pkg_output_file | grep 'to be downloaded' | awk -F '[ ]' '{print $1$2}'` if [ "$download_size" == "" ]; then - download_size="none" + download_size="unknown" fi LQUERY=$(pkg query %v opnsense-update) @@ -301,5 +295,5 @@ if [ "$pkg_running" == "" ]; then last_check=$(date) # Write our json structure to disk - echo "{\"connection\":\"$connection\",\"repository\":\"$repository\",\"product_version\":\"$product_version\",\"product_name\":\"$product_name\",\"os_version\":\"$os_version\",\"last_check\":\"$last_check\",\"updates\":\"$updates\",\"download_size\":\"$download_size\",\"extra_space_required\":\"$required_space\",\"new_packages\":[$packages_new],\"reinstall_packages\":[$packages_reinstall],\"upgrade_packages\":[$packages_upgraded],\"downgrade_packages\":[$packages_downgraded],\"upgrade_needs_reboot\":\"$upgrade_needs_reboot\"}" + echo "{\"connection\":\"$connection\",\"repository\":\"$repository\",\"product_version\":\"$product_version\",\"product_name\":\"$product_name\",\"os_version\":\"$os_version\",\"last_check\":\"$last_check\",\"updates\":\"$updates\",\"download_size\":\"$download_size\",\"new_packages\":[$packages_new],\"reinstall_packages\":[$packages_reinstall],\"upgrade_packages\":[$packages_upgraded],\"downgrade_packages\":[$packages_downgraded],\"upgrade_needs_reboot\":\"$upgrade_needs_reboot\"}" fi