jackbenny/check_smhi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed two bugs

Browse Source
This commit is contained in:
Jack-Benny Persson 2014-01-04 10:36:36 +01:00
parent 2f6e516856
commit c62d25ec53
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG
View File

@ -1,4 +1,13 @@
2014-01-03 2014-01-03
Version 0.1 - First release of the plugin Version 0.1 - First release of the plugin
2013-01-04
Version 0.2 - Fixed two bugs, whereas one important
1. In case there more than one wheater alert for the specified
region, the script would bug out. Fixed by adding 'head -n1'
so that it always only shows the first warning issued.
2. In case there were swedish characters (åäö) in the warning
message they would output as their HTML-equivalent. Fixed
with another sed substitue command.

15
check_smhi.sh
View File

@ -21,14 +21,14 @@
################################################################################ ################################################################################
# check_smhi # check_smhi
Version="0.1" Version="0.2"
Author="Jack-Benny Persson (jack-benny@cyberinfo.se)" Author="Jack-Benny Persson (jack-benny@cyberinfo.se)"
# Binaries # Binaries
Which="/usr/bin/which" Which="/usr/bin/which"
# Binaries entered in the list will be avalible to the script as variables with # Binaries entered in the list will be avalible to the script as variables with
# the first letter uppercase # the first letter uppercase
Binaries=(sed awk egrep printf curl) Binaries=(sed awk egrep printf curl head)
# Variables # Variables
District="" District=""
@ -214,13 +214,20 @@ s/Ö/\&Ouml\;/g
}'` }'`
# Get the line number for the current district in the HTML-file and add one line to it # Get the line number for the current district in the HTML-file and add one line to it
LineNr=`echo "$Data" | $Sed -n "/$HtmlDist/="` LineNr=`echo "$Data" | $Sed -n "/$HtmlDist/=" | $Head -n1`
((LineNr++)) ((LineNr++))
# Read the warning message (for example kuling, orkan, åska) # Read the warning message (for example kuling, orkan, åska)
WarnMsg=`echo "$Data" | $Sed -n "${LineNr}p" | $Egrep -o "Varning klass [0-3] .*" | \ WarnMsg=`echo "$Data" | $Sed -n "${LineNr}p" | $Egrep -o "Varning klass [0-3] .*" | \
$Sed 's/\(.*\).........../\1/' | \ $Sed 's/\(.*\).........../\1/' | \
$Awk '{print substr($0, index($0,$4))}'` $Awk '{print substr($0, index($0,$4))}' | $Sed '{
s/\&aring\;/å/g
s/\&Aring\;/Å/g
s/\&auml\;/ä/g
s/\&Auml\;/Å/g
s/\&ouml\;/ö/g
s/\&Ouml\;/Ö/g
}'`
# Get the current warning class (1, 2 and 3) # Get the current warning class (1, 2 and 3)
Class=`echo "$Data" | $Sed -n "${LineNr}p" | $Egrep -o "Varning klass [0-3]" \ Class=`echo "$Data" | $Sed -n "${LineNr}p" | $Egrep -o "Varning klass [0-3]" \