From dd3569076357cfaa7b7b146819e46bc64ace7b68 Mon Sep 17 00:00:00 2001 From: Christopher Bock Date: Thu, 15 Aug 2024 01:55:16 +0200 Subject: [PATCH 1/2] pkg_upgrade: opnsense/scripts/firmware/check.sh bumbed versionnumber --- files/opnsense.fact | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/files/opnsense.fact b/files/opnsense.fact index 5c7c8f8..dfe2cb7 100644 --- a/files/opnsense.fact +++ b/files/opnsense.fact @@ -1,5 +1,9 @@ #! /bin/sh +if [ -z "$(find /tmp/pkg_upgrade.json -cmin -5)" ]; then + /usr/local/opnsense/scripts/firmware/check.sh > /dev/null +fi + echo "{" cd /usr/local/opnsense/version/ @@ -14,7 +18,12 @@ if [ -x /usr/local/opnsense/scripts/firmware/changelog.sh ]; then echo "," fi +echo "\"ansible_opnsense_facts_version\": \"0.2\"," -echo "\"ansible_opnsense_facts_version\": \"0.1\"" +if [ -e /tmp/pkg_upgrade.json ]; then + echo "\"pkg_upgrade\": [" + cat /tmp/pkg_upgrade.json + echo "]" +fi echo "}" From 5598ae131394b5ef7e25105ffe57c248737cb274 Mon Sep 17 00:00:00 2001 From: Christopher Bock Date: Fri, 16 Aug 2024 13:44:12 +0200 Subject: [PATCH 2/2] put version at end of code --- files/opnsense.fact | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/files/opnsense.fact b/files/opnsense.fact index dfe2cb7..143de5e 100644 --- a/files/opnsense.fact +++ b/files/opnsense.fact @@ -18,12 +18,12 @@ if [ -x /usr/local/opnsense/scripts/firmware/changelog.sh ]; then echo "," fi -echo "\"ansible_opnsense_facts_version\": \"0.2\"," - if [ -e /tmp/pkg_upgrade.json ]; then echo "\"pkg_upgrade\": [" cat /tmp/pkg_upgrade.json - echo "]" + echo "]," fi +echo "\"ansible_opnsense_facts_version\": \"0.2\"" + echo "}"