From 986ae3ea5386be0dc4787e4c69fbd9f6630fd9c6 Mon Sep 17 00:00:00 2001 From: Fred Clausen <43556888+fredclausen@users.noreply.github.com> Date: Mon, 18 Dec 2023 11:40:59 -0700 Subject: [PATCH] apply temp fix for the fact that I've renamed everything to be a ".sh" file --- rootfs/etc/s6-overlay/scripts/01-dumphfdl.sh | 6 ++++++ rootfs/etc/s6-overlay/scripts/03-sdrplay-license.sh | 6 ++++++ rootfs/etc/s6-overlay/scripts/hfdl_feeder.sh | 6 ++++++ rootfs/etc/s6-overlay/scripts/hfdl_stats.sh | 6 +++++- rootfs/etc/s6-overlay/scripts/sdrplay.sh | 6 ++++++ 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/rootfs/etc/s6-overlay/scripts/01-dumphfdl.sh b/rootfs/etc/s6-overlay/scripts/01-dumphfdl.sh index a37855c..c6ce099 100755 --- a/rootfs/etc/s6-overlay/scripts/01-dumphfdl.sh +++ b/rootfs/etc/s6-overlay/scripts/01-dumphfdl.sh @@ -4,6 +4,12 @@ # shellcheck disable=SC1091 source /scripts/common +SCRIPT_NAME="$(basename "$0")" +SCRIPT_NAME="${SCRIPT_NAME%.*}" + +# shellcheck disable=SC2034 +s6wrap=(s6wrap --quiet --timestamps --prepend="$SCRIPT_NAME" --args) + if [[ -z "$SOAPYSAMPLERATE" ]]; then # shellcheck disable=SC2154 "${s6wrap[@]}" echo "SOAPYSAMPLERATE is not set, exiting" diff --git a/rootfs/etc/s6-overlay/scripts/03-sdrplay-license.sh b/rootfs/etc/s6-overlay/scripts/03-sdrplay-license.sh index 42f5a54..a4c1234 100755 --- a/rootfs/etc/s6-overlay/scripts/03-sdrplay-license.sh +++ b/rootfs/etc/s6-overlay/scripts/03-sdrplay-license.sh @@ -3,6 +3,12 @@ #shellcheck disable=SC1091 source /scripts/common +SCRIPT_NAME="$(basename "$0")" +SCRIPT_NAME="${SCRIPT_NAME%.*}" + +# shellcheck disable=SC2034 +s6wrap=(s6wrap --quiet --timestamps --prepend="$SCRIPT_NAME" --args) + #shellcheck disable=SC2154 "${s6wrap[@]}" echo "This container uses SDRPlay API V3. If you are using a device that will use SDRPlay please be sure" "${s6wrap[@]}" echo "you are conforming to the license agreement." diff --git a/rootfs/etc/s6-overlay/scripts/hfdl_feeder.sh b/rootfs/etc/s6-overlay/scripts/hfdl_feeder.sh index 0d1a2e7..bf88ab2 100755 --- a/rootfs/etc/s6-overlay/scripts/hfdl_feeder.sh +++ b/rootfs/etc/s6-overlay/scripts/hfdl_feeder.sh @@ -4,6 +4,12 @@ #shellcheck disable=SC1091 source /scripts/common +SCRIPT_NAME="$(basename "$0")" +SCRIPT_NAME="${SCRIPT_NAME%.*}" + +# shellcheck disable=SC2034 +s6wrap=(s6wrap --quiet --timestamps --prepend="$SCRIPT_NAME" --args) + set -o pipefail if [[ -n ${SERVER} ]]; then diff --git a/rootfs/etc/s6-overlay/scripts/hfdl_stats.sh b/rootfs/etc/s6-overlay/scripts/hfdl_stats.sh index e33e5b5..e5f9485 100755 --- a/rootfs/etc/s6-overlay/scripts/hfdl_stats.sh +++ b/rootfs/etc/s6-overlay/scripts/hfdl_stats.sh @@ -2,7 +2,11 @@ #shellcheck shell=bash #shellcheck disable=SC2154 -s6wrap=(s6wrap --quiet --timestamps --prepend="$(basename "$0")" --args) +SCRIPT_NAME="$(basename "$0")" +SCRIPT_NAME="${SCRIPT_NAME%.*}" + +# shellcheck disable=SC2034 +s6wrap=(s6wrap --quiet --timestamps --prepend="$SCRIPT_NAME" --args) set -o pipefail diff --git a/rootfs/etc/s6-overlay/scripts/sdrplay.sh b/rootfs/etc/s6-overlay/scripts/sdrplay.sh index 8fdcd48..6f4db56 100755 --- a/rootfs/etc/s6-overlay/scripts/sdrplay.sh +++ b/rootfs/etc/s6-overlay/scripts/sdrplay.sh @@ -4,5 +4,11 @@ #shellcheck disable=SC1091 source /scripts/common +SCRIPT_NAME="$(basename "$0")" +SCRIPT_NAME="${SCRIPT_NAME%.*}" + +# shellcheck disable=SC2034 +s6wrap=(s6wrap --quiet --timestamps --prepend="$SCRIPT_NAME" --args) + #shellcheck disable=SC2154 "${s6wrap[@]}" /usr/bin/sdrplay_apiService