From 585bca0a933d3edf4acec225fd5e34042be2ff68 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zolt=C3=A1n=20Felleg?= <zoltan.felleg@userrendszerhaz.hu>
Date: Mon, 12 Apr 2021 12:59:40 +0200
Subject: [PATCH] Updated vhost{1, 2}.in (temperature script corrections).

---
 sources/vhost1.in/root/temperature.sh | 7 +++----
 sources/vhost2.in/root/temperature.sh | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/sources/vhost1.in/root/temperature.sh b/sources/vhost1.in/root/temperature.sh
index 2759e1b..33f2993 100755
--- a/sources/vhost1.in/root/temperature.sh
+++ b/sources/vhost1.in/root/temperature.sh
@@ -61,7 +61,7 @@ delete_received_smses() {
          | grep '<Index>' \
          | while read LINE
     do
-        INDEX=$(echo $LINE | sed 's|^ *<Index>\([0-9]*\)</Index> *$|\1|')
+        INDEX=$(echo $LINE | sed 's|^.*<Index>\([0-9]*\)</Index>.*$|\1|')
 
         curl --output /tmp/ses_tok.xml \
              --request GET \
@@ -109,7 +109,7 @@ delete_sent_smses() {
          | grep '<Index>' \
          | while read LINE
     do
-        INDEX=$(echo $LINE | sed 's|^ *<Index>\([0-9]*\)</Index> *$|\1|')
+        INDEX=$(echo $LINE | sed 's|^.*<Index>\([0-9]*\)</Index>.*$|\1|')
 
         curl --output /tmp/ses_tok.xml \
              --request GET \
@@ -254,10 +254,9 @@ send_stop_sms() {
 
 
     RECEIVED_SMS_COUNT=$(grep '<Count>' /tmp/received_smses.txt \
-                             | sed 's|^ *<Count>\([0-9]*\)</Count> *$|\1|')
+                             | sed 's|^.*<Count>\([0-9]*\)</Count>.*$|\1|')
     if [ $RECEIVED_SMS_COUNT -lt 1 ]
     then
-        rm -f /tmp/received_smses.txt
 	return
     fi
     STOP_NUMBER=$(grep '<Phone>' /tmp/received_smses.txt \
diff --git a/sources/vhost2.in/root/temperature.sh b/sources/vhost2.in/root/temperature.sh
index 2759e1b..33f2993 100755
--- a/sources/vhost2.in/root/temperature.sh
+++ b/sources/vhost2.in/root/temperature.sh
@@ -61,7 +61,7 @@ delete_received_smses() {
          | grep '<Index>' \
          | while read LINE
     do
-        INDEX=$(echo $LINE | sed 's|^ *<Index>\([0-9]*\)</Index> *$|\1|')
+        INDEX=$(echo $LINE | sed 's|^.*<Index>\([0-9]*\)</Index>.*$|\1|')
 
         curl --output /tmp/ses_tok.xml \
              --request GET \
@@ -109,7 +109,7 @@ delete_sent_smses() {
          | grep '<Index>' \
          | while read LINE
     do
-        INDEX=$(echo $LINE | sed 's|^ *<Index>\([0-9]*\)</Index> *$|\1|')
+        INDEX=$(echo $LINE | sed 's|^.*<Index>\([0-9]*\)</Index>.*$|\1|')
 
         curl --output /tmp/ses_tok.xml \
              --request GET \
@@ -254,10 +254,9 @@ send_stop_sms() {
 
 
     RECEIVED_SMS_COUNT=$(grep '<Count>' /tmp/received_smses.txt \
-                             | sed 's|^ *<Count>\([0-9]*\)</Count> *$|\1|')
+                             | sed 's|^.*<Count>\([0-9]*\)</Count>.*$|\1|')
     if [ $RECEIVED_SMS_COUNT -lt 1 ]
     then
-        rm -f /tmp/received_smses.txt
 	return
     fi
     STOP_NUMBER=$(grep '<Phone>' /tmp/received_smses.txt \
-- 
2.54.0