c-l/docker-adsb-ultrafeeder
1
0
Fork 0
mirror of https://github.com/sdr-enthusiasts/docker-adsb-ultrafeeder.git synced 2024-11-25 15:20:10 +00:00
Code Releases Activity

adsbx stats: more robust way of getting UUID from ultrafeeder_config (#72)

Browse source 
When no adsbexchange uuid was present the sed replacement can fail to
replace anything because the pattern doesn't exist.
In that case the entire readsb conf array is used as an UUID.

Fix that by checking each conf array entry if there is a adsbexchange
uuid and only then use the sed replace.
This commit is contained in:
kx1t 2024-03-29 12:18:59 -04:00 committed by GitHub
commit 16ea7448ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
rootfs/etc/s6-overlay/scripts/adsbx-stats
View file

@ -34,7 +34,12 @@ fi
# set the UUID: # set the UUID:
if [[ ! -f /usr/local/share/adsbexchange/adsbx-uuid ]]; then if [[ ! -f /usr/local/share/adsbexchange/adsbx-uuid ]]; then
ADSBX_UUID="$(sed 's|.*adsbexchange.*uuid=\([a-f0-9-]\+\).*|\1|g' <<< "${READSB_CONF_ARR[@]}")" || true # get UUID from ULTRAFEEDER_CONFIG if it exists # get UUID from ULTRAFEEDER_CONFIG if it exists
for entry in "${READSB_CONF_ARR[@]}"; do
if echo "$entry" | grep -q 'adsbexchange.*uuid'; then
ADSBX_UUID="$(sed 's|.*adsbexchange.*uuid=\([a-f0-9-]\+\).*|\1|g' <<< "$entry")"
fi
done
ADSBX_UUID="${ADSBX_UUID:-${UUID}}" || true # ...else get it from the UUID param ADSBX_UUID="${ADSBX_UUID:-${UUID}}" || true # ...else get it from the UUID param
ADSBX_UUID="${ADSBX_UUID:-$(cat /proc/sys/kernel/random/uuid 2>/dev/null)}" || true # ...else generate a random one ADSBX_UUID="${ADSBX_UUID:-$(cat /proc/sys/kernel/random/uuid 2>/dev/null)}" || true # ...else generate a random one
if [[ -n "$ADSBX_UUID" ]]; then if [[ -n "$ADSBX_UUID" ]]; then