From 5ac34a84d551367a8dfdf5da3b869e369db75ca1 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 19 Jul 2023 13:41:04 +0200 Subject: [PATCH] firmware: fix a small (and old) glitch in the JSON construction --- src/opnsense/scripts/firmware/check.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/opnsense/scripts/firmware/check.sh b/src/opnsense/scripts/firmware/check.sh index c7c9a2757..609a9adf7 100755 --- a/src/opnsense/scripts/firmware/check.sh +++ b/src/opnsense/scripts/firmware/check.sh @@ -365,7 +365,10 @@ if [ -n "${packages_is_size}" ]; then if [ "${kernel_to_delete}" != "${upgrade_major_version}" ]; then kernel_is_size="$(opnsense-update -SRk)" if [ -n "${kernel_is_size}" ]; then - sets_upgraded="${sets_upgraded},{\"name\":\"kernel\",\"size\":\"${kernel_is_size}\",\"current_version\":\"${kernel_to_delete}\",\"new_version\":\"${upgrade_major_version}\",\"repository\":\"${product_repo}\"}" + if [ -n "${sets_upgraded}" ]; then + sets_upgraded="${sets_upgraded}," + fi + sets_upgraded="${sets_upgraded}{\"name\":\"kernel\",\"size\":\"${kernel_is_size}\",\"current_version\":\"${kernel_to_delete}\",\"new_version\":\"${upgrade_major_version}\",\"repository\":\"${product_repo}\"}" upgrade_needs_reboot="1" fi fi @@ -374,7 +377,10 @@ if [ -n "${packages_is_size}" ]; then if [ "${base_to_delete}" != "${upgrade_major_version}" ]; then base_is_size="$(opnsense-update -SRb)" if [ -n "${base_is_size}" ]; then - sets_upgraded="${sets_upgraded},{\"name\":\"base\",\"size\":\"${base_is_size}\",\"current_version\":\"${base_to_delete}\",\"new_version\":\"${upgrade_major_version}\",\"repository\":\"${product_repo}\"}" + if [ -n "${sets_upgraded}" ]; then + sets_upgraded="${sets_upgraded}," + fi + sets_upgraded="${sets_upgraded}{\"name\":\"base\",\"size\":\"${base_is_size}\",\"current_version\":\"${base_to_delete}\",\"new_version\":\"${upgrade_major_version}\",\"repository\":\"${product_repo}\"}" upgrade_needs_reboot="1" fi fi