mirror of
https://github.com/sdr-enthusiasts/docker-adsb-ultrafeeder.git
synced 2024-12-04 19:50:10 +00:00
Fix issues due to bad merge in PR 162 (#163)
https://github.com/sdr-enthusiasts/docker-adsb-ultrafeeder/pull/162 has a bad merge in there that reverts earlier PRs fix it using the following steps: - revert the entire PR - cherry-pick the 2 commits that are the intended content of the PR
This commit is contained in:
commit
b813db2147
6 changed files with 0 additions and 51 deletions
|
@ -1,2 +0,0 @@
|
|||
#!/bin/sh
|
||||
exec /etc/s6-overlay/scripts/cleanup_globe_history
|
|
@ -1 +0,0 @@
|
|||
longrun
|
|
@ -1,40 +0,0 @@
|
|||
#!/command/with-contenv bash
|
||||
# shellcheck shell=bash disable=SC2015,SC2016,SC1091,SC2001,SC2154
|
||||
|
||||
#---------------------------------------------------------------------------------------------
|
||||
# Script to remove Globe_History files older than xxx days - this to ensure that the disk
|
||||
# doesn't fill up with (unwanted) history files)
|
||||
|
||||
# Copyright (C) 2023-2024, Ramon F. Kolb (kx1t) and contributors
|
||||
# Core script copyright and provided by Matthias Wirth (wiedehopf), used with permission
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by the
|
||||
# Free Software Foundation, either version 3 of the License, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License along with this program.
|
||||
# If not, see <https://www.gnu.org/licenses/>.
|
||||
#---------------------------------------------------------------------------------------------
|
||||
|
||||
source /scripts/common
|
||||
|
||||
if [[ -z "$MAX_GLOBE_HISTORY" ]]; then
|
||||
"${s6wrap[@]}" echo "MAX_GLOBE_HISTORY not set - we will not expire any globe_history files"
|
||||
exec sleep infinity
|
||||
fi
|
||||
|
||||
cutoffepoch="$(date -d"-${MAX_GLOBE_HISTORY} days" +%s)"
|
||||
|
||||
"${s6wrap[@]}" echo "Purging globe_history older than $MAX_GLOBE_HISTORY days (before $(date -d"-${MAX_GLOBE_HISTORY} days" +%d-%b-%Y))"
|
||||
for dir in $(find /var/globe_history -maxdepth 3 -mindepth 3 | grep -o -E -e '[0-9]{4}/[0-9]{2}/[0-9]{2}$'); do
|
||||
if (( $(date -d "$dir" +%s) < cutoffepoch )); then
|
||||
rm -rf "/var/globe_history/$dir"
|
||||
fi
|
||||
done
|
||||
"${s6wrap[@]}" echo "Done - next purge will be in 24 hours"
|
||||
exec sleep 24h
|
|
@ -97,14 +97,6 @@ do
|
|||
done
|
||||
# Now add $readsb_str to the READSB_CONF_ARR() as --net-connector argument:
|
||||
READSB_CONF_ARR+=("--net-connector=${readsb_str}")
|
||||
|
||||
if [[ ${param[1],,} == "in.adsb.lol" ]]; then
|
||||
myadsblol="$(curl -sLD - https://my.adsb.lol -o /dev/null -w '%{url_effective}' 2>&1 | sed '/location: /h;g;$!d;s/^.* \(.*\)$/\1/')"
|
||||
if [[ -n "$myadsblol" ]] && [[ ! $myadsblol =~ sorry-but-i-could-not-find-your-receiver ]]; then
|
||||
"${s6wrap[@]}" echo "ADSB.LOL station map available at $myadsblol"
|
||||
fi
|
||||
fi
|
||||
|
||||
;;
|
||||
|
||||
mlat)
|
||||
|
|
Loading…
Reference in a new issue