Fix issues due to bad merge in PR 162 (#163)

#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
sdr-enthusiasts · Nov 28, 2024 · b813db2 · b813db2
2 parents 4983ba6 + d19dceb
commit b813db2
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 51 deletions.
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/cleanup_globe_history/dependencies.d/startup b/rootfs/etc/s6-overlay/s6-rc.d/cleanup_globe_history/dependencies.d/startup
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/cleanup_globe_history/run b/rootfs/etc/s6-overlay/s6-rc.d/cleanup_globe_history/run
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/cleanup_globe_history/type b/rootfs/etc/s6-overlay/s6-rc.d/cleanup_globe_history/type
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/cleanup_globe_history b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/cleanup_globe_history
diff --git a/rootfs/etc/s6-overlay/scripts/cleanup_globe_history b/rootfs/etc/s6-overlay/scripts/cleanup_globe_history
diff --git a/rootfs/scripts/interpret_ultrafeeder_config b/rootfs/scripts/interpret_ultrafeeder_config
@@ -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)