Updated vhost{1, 2}.in (temperature script corrections).

diff --git a/sources/vhost1.in/root/temperature.sh b/sources/vhost1.in/root/temperature.sh
index 2759e1bc04d622991c31fcc62fb060ef194adcfd..33f2993e101c3c9d2e754f321842646c5a0a5109 100755 (executable)
--- 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 2759e1bc04d622991c31fcc62fb060ef194adcfd..33f2993e101c3c9d2e754f321842646c5a0a5109 100755 (executable)
--- 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 \