mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Move latest version request to schedule script

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-09-06 14:14:57 +02:00
parent 1421ef88e6
commit 71522c3998
2 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
omr-schedule/files/usr/share/omr/schedule.d/010-services
View file

@ -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

18
omr-tracker/files/usr/share/omr/post-tracking.d/020-status
View file

@ -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