From a957894d9ae9b4fab3d9a26d4a577b36c8e3f9a6 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 29 Jun 2023 13:30:37 +0200 Subject: [PATCH] Removed usage of obsolete variable TC_PSA_TC_FILE (=tariff.current) and ATBQT_ATB_SYS_BIN_FILE. For ATBQT_ATB_SYS_BIN_FILE use /opt/app/ATBAPP/ATBQT directly. --- news_to_ismas | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/news_to_ismas b/news_to_ismas index 2bbb9ad..e41c0b0 100755 --- a/news_to_ismas +++ b/news_to_ismas @@ -396,7 +396,6 @@ if [ "${news_to_ismas_sourced:-1}" = "1" ]; then # include only once \"HASH\":\"$(compute_hash)\" }, \"TARIFF\" : { - $(<$TC_PSA_TC_FILE) }, \"HARDWARE\" : { \"DEVICES\" : [ @@ -425,10 +424,10 @@ if [ "${news_to_ismas_sourced:-1}" = "1" ]; then # include only once \"RAUC\" : \"$(rauc --version)\", \"OPKG\" : \"$(opkg --version)\", \"ATBQT\" : { - \"VERSION\" : \"$($ATBQT_ATB_SYS_BIN_FILE -v | + \"VERSION\" : \"$(/opt/app/ATBAPP/ATBQT -v | grep Version | sed -E -e 's/.*:\s*(.*)/\1/g')\", - \"GIT_DESCRIBE\" : \"$($ATBQT_ATB_SYS_BIN_FILE -v | + \"GIT_DESCRIBE\" : \"$(/opt/app/ATBAPP/ATBQT -v | grep git | sed -E -e 's/.*:\s*(.*)/\1/g')\" },