code refactoring

1 files changed, 8 insertions, 10 deletions

diff --git a/e3372.sh b/e3372.sh
index 8f298e9..350dd33 100755
--- a/e3372.sh
+++ b/e3372.sh
@@ -1,21 +1,19 @@
 #!/bin/bash
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
 . "$DIR/config.sh"
 
-curl -s -X GET "http://$MODEM_IP/api/webserver/SesTokInfo" > ses_tok.xml
-COOKIE=`grep "SessionID=" ses_tok.xml | cut -b 10-147`
-TOKEN=`grep "TokInfo" ses_tok.xml | cut -b 10-41` 
+get_token
 
 curl -s -X GET "http://$MODEM_IP/api/device/information" \
-  -H "Cookie: $COOKIE" \
-  -H "__RequestVerificationToken: $TOKEN" \
-  -H "Content-Type: text/xml" > modem_status.xml
+    -H "Cookie: $COOKIE" \
+    -H "__RequestVerificationToken: $TOKEN" \
+    -H "Content-Type: text/xml" >modem_status.xml
 
 curl -s -X GET "http://$MODEM_IP/api/device/signal" \
-  -H "Cookie: $COOKIE" \
-  -H "__RequestVerificationToken: $TOKEN" \
-  -H "Content-Type: text/xml" >> modem_status.xml
+    -H "Cookie: $COOKIE" \
+    -H "__RequestVerificationToken: $TOKEN" \
+    -H "Content-Type: text/xml" >>modem_status.xml
 
 wmode=$(cat modem_status.xml | grep workmode | sed -e 's/<[^>]*>//g')
 rssi=$(cat modem_status.xml | grep rssi | sed -e 's/<[^>]*>//g')