From 71522c3998b5628a86cb554af64de81d00c7506b Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 6 Sep 2024 14:14:57 +0200
Subject: [PATCH] Move latest version request to schedule script

---
 .../usr/share/omr/schedule.d/010-services      | 17 +++++++++++++++++
 .../usr/share/omr/post-tracking.d/020-status   | 18 +++++++++---------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/omr-schedule/files/usr/share/omr/schedule.d/010-services b/omr-schedule/files/usr/share/omr/schedule.d/010-services
index 0970d355b..91d565280 100755
--- a/omr-schedule/files/usr/share/omr/schedule.d/010-services
+++ b/omr-schedule/files/usr/share/omr/schedule.d/010-services
@@ -279,4 +279,21 @@ if [ "$(pgrep -f set_vps_firewall)" = "" ] && [ "$(uci -q show openmptcprouter |
 	#sh /etc/firewall.gre-tunnel >/dev/null 2>&1
 	/bin/blocklanfw >/dev/null 2>&1
 	sleep 5
+fi
+if [ "$(uci -q get openmptcprouter.latest_versions.lc)" = "" ] || [ $(($(date +"%s") - $(uci -q get openmptcprouter.latest_versions.lc))) -gt 3600 ]; then
+	distribution="$(ubus call system board | jsonfilter -q -e '@.release.distribution' | tr -d '\n')"
+	version="$(ubus call system board | jsonfilter -q -e '@.release.version' | tr -d '\n')"
+	latestversions="$(curl -4 -s -m 3 -A "${distribution}/${version}" https://www.openmptcprouter.com/version/version.json)"
+	[ -n "$latestversions" ] && {
+		uci -q set openmptcprouter.latest_versions=latest_versions
+		if [ "${distribution}" = "openmptcprouter" ]; then
+			uci -q set openmptcprouter.latest_versions.omr=$(echo $latestversions | jsonfilter -q -e '@.omr')-$(ubus call system board | jsonfilter -e '@.kernel' | cut -d'.' -f1,2)
+			uci -q set openmptcprouter.latest_versions.vps=$(echo $latestversions | jsonfilter -q -e '@.vps')
+		else
+			uci -q del openmptcprouter.latest_versions.omr
+			uci -q del openmptcprouter.latest_versions.vps
+		fi
+		uci -q set openmptcprouter.latest_versions.lc=$(date +"%s")
+		uci -q commit openmptcprouter
+	}
 fi
\ No newline at end of file
diff --git a/omr-tracker/files/usr/share/omr/post-tracking.d/020-status b/omr-tracker/files/usr/share/omr/post-tracking.d/020-status
index 7f3fbf0b3..a9a2fa1dd 100755
--- a/omr-tracker/files/usr/share/omr/post-tracking.d/020-status
+++ b/omr-tracker/files/usr/share/omr/post-tracking.d/020-status
@@ -56,15 +56,15 @@ if [ -n "$OMR_TRACKER_INTERFACE" ] && { [ "$(uci -q get openmptcprouter.$OMR_TRA
 		[ -z "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE)" ] && {
 			uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE=interface
 		}
-		if [ "$(uci -q get openmptcprouter.latest_versions.lc)" = "" ] || [ $(($(date +"%s") - $(uci -q get openmptcprouter.latest_versions.lc))) -gt 3600 ]; then
-			latestversions="$(curl -4 -s -m 3 https://www.openmptcprouter.com/version/version.json)"
-			[ -n "$latestversions" ] && {
-				uci -q set openmptcprouter.latest_versions=latest_versions
-				uci -q set openmptcprouter.latest_versions.omr=$(echo $latestversions | jsonfilter -q -e '@.omr')-$(ubus call system board | jsonfilter -e '@.kernel' | cut -d'.' -f1,2)
-				uci -q set openmptcprouter.latest_versions.vps=$(echo $latestversions | jsonfilter -q -e '@.vps')
-				uci -q set openmptcprouter.latest_versions.lc=$(date +"%s")
-			}
-		fi
+		#if [ "$(uci -q get openmptcprouter.latest_versions.lc)" = "" ] || [ $(($(date +"%s") - $(uci -q get openmptcprouter.latest_versions.lc))) -gt 3600 ]; then
+		#	latestversions="$(curl -4 -s -m 3 https://www.openmptcprouter.com/version/version.json)"
+		#	[ -n "$latestversions" ] && {
+		#		uci -q set openmptcprouter.latest_versions=latest_versions
+		#		uci -q set openmptcprouter.latest_versions.omr=$(echo $latestversions | jsonfilter -q -e '@.omr')-$(ubus call system board | jsonfilter -e '@.kernel' | cut -d'.' -f1,2)
+		#		uci -q set openmptcprouter.latest_versions.vps=$(echo $latestversions | jsonfilter -q -e '@.vps')
+		#		uci -q set openmptcprouter.latest_versions.lc=$(date +"%s")
+		#	}
+		#fi
 		[ -n "$ipaddr" ] && [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.publicip)" != "$ipaddr" ] && {
 			previousip="$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.publicip)"
 			if [ -n "$previousip" ]; then