From 259b61cda588eed1ee77db744cc10394a95135fd Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 7 Jun 2022 21:50:48 +0200 Subject: [PATCH] adapted because of changes in read_config --- news_to_ismas | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/news_to_ismas b/news_to_ismas index 5d539ad..6f3f77f 100755 --- a/news_to_ismas +++ b/news_to_ismas @@ -375,6 +375,9 @@ if [ ${news_to_ismas_sourced:-1} = "1" ]; then # include only once current_settings_to_ismas () { local func="${FUNCNAME[0]}" local p=("$@") + + return 0 + local data="#M=APISM#C=CMD_SENDVERSION#J= { \"VERSION_INFO\" : { @@ -382,7 +385,7 @@ if [ ${news_to_ismas_sourced:-1} = "1" ]; then # include only once \"HASH\":\"$(compute_hash)\" }, \"TARIFF\": { - $(<$TARIFF_CURRENT_FULL) + $(<$TC_PSA_TC_FILE) }, \"HARDWARE\" : { \"DEVICES\" : [ @@ -399,8 +402,8 @@ if [ ${news_to_ismas_sourced:-1} = "1" ]; then # include only once sed -E -e 's/.*:\s*(.*)/\1/g')\" }, \"DC\" : { - \"VERSION\" : \"$(cat $UPDATE_CONF | jq -r .dc.version)\", - \"MD5SUM\" : \"$(cat $UPDATE_CONF | jq -r .dc.dc2c)\" + \"VERSION\" : \"$(cat $PSA_UPDATE_CONF | jq -r .dc.version)\", + \"MD5SUM\" : \"$(cat $PSA_UPDATE_CONF | jq -r .dc.dc2c)\" }, \"PRINTER\" : { },