lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 08:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

firmware: rather say "unknown" instead of "none"

Browse Source 
Remove an unused and only marginally useful value while there and
touch the strings that are displayed during execution, "please
wait" looks a lot friendlier and is more correct than 30 secs.
This commit is contained in:
Franco Fichtner 2017-10-08 14:30:51 +00:00
parent 75b06dc8ae
commit 7fd0451f32
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
View File

@ -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() {

14
src/opnsense/scripts/firmware/check.sh
View File

@ -30,8 +30,7 @@
# repository: error|ok
# last_ckeck: <date_time_stamp>
# updates: <#num_of_updates>
# download_size: none|<size_of_total_downloads>
# extra_space_required: none|<size_of_total_extra_space_required>
# download_size: unknown|<size_of_total_downloads>
# new_packages: array with { name: <package_name>, version: <package_version> }
# reinstall_packages: array with { name: <package_name>, version: <package_version> }
# upgrade_packages: array with { name: <package_name>, current_version: <current_version>, new_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