From 7d1ac56eaea7b9a116f1eb010d228c354f42d18c Mon Sep 17 00:00:00 2001
From: obma <max@mober.at>
Date: Mon, 5 Oct 2015 20:19:14 +0200
Subject: [PATCH 1/4] p: updating openweather_: replaced fgrep, tr, cut with
 expr

Use expr to extract values and names from the OpenWeather API xml instead of the - when using a city with spaces in its name not correctly working - fgrep | tr | cut construct.
---
 plugins/weather/openweather_ | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 plugins/weather/openweather_

diff --git a/plugins/weather/openweather_ b/plugins/weather/openweather_
old mode 100644
new mode 100755
index bbd3c7a4..a7eea886
--- a/plugins/weather/openweather_
+++ b/plugins/weather/openweather_
@@ -19,15 +19,13 @@
 # env.apikey XYZ
 
 query_string=$(printf '%s' "${0#*_}" | tr '_' '=')
-TMPFILE=$(mktemp)
-trap 'rm -f $TMPFILE' EXIT
 
+OWAPI=$( curl -s "http://api.openweathermap.org/data/2.5/weather?mode=xml&${query_string}")
 # API returns temp in K, we have to convert it in C
+# &units=metric would change that ;-)
 KELVIN_BIAS=273
 
-curl -s "http://api.openweathermap.org/data/2.5/weather?mode=xml&${query_string}&APPID=${apikey}" > $TMPFILE
-
-CITY=$(fgrep "<city id=" $TMPFILE | tr -sc '[:alnum:]' ' ' | cut -d " " -f 6)
+CITY=$( expr "$OWAPI" : '.*\<city.*name=\"\(.*\)\"><coord.*' )
 
 if [ "$1" = "config" ];
 then
@@ -85,15 +83,15 @@ then
 	[ "$MUNIN_CAP_DIRTYCONFIG" = 1 ] || exit 0
 fi
 
-TEMP_AVG=$(fgrep "<temperature value=" $TMPFILE | tr -sc '[:alnum:].' ' ' | cut -d " " -f 4)
-TEMP_MIN=$(fgrep "<temperature value=" $TMPFILE | tr -sc '[:alnum:].' ' ' | cut -d " " -f 6)
-TEMP_MAX=$(fgrep "<temperature value=" $TMPFILE | tr -sc '[:alnum:].' ' ' | cut -d " " -f 8)
+TEMP_AVG=$( expr "$OWAPI" : '.*\<temperature value=\"\(.*\)\" min.*/temperature.*' )
+TEMP_MIN=$( expr "$OWAPI" : '.*\<temperature .*min=\"\(.*\)\" max.*/temperature.*' )
+TEMP_MAX=$( expr "$OWAPI" : '.*\<temperature .*max=\"\(.*\)\" unit.*/temperature.*' )
 
-HUMIDITY=$(fgrep "<humidity value=" $TMPFILE | tr -sc '[:alnum:].' ' ' | cut -d " " -f 4)
-PRESSURE=$(fgrep "<pressure value=" $TMPFILE | tr -sc '[:alnum:].' ' ' | cut -d " " -f 4)
+HUMIDITY=$( expr "$OWAPI" : '.*\<humidity .*value=\"\(.*\)\" unit.*/humidity.*' )
+PRESSURE=$( expr "$OWAPI" : '.*\<pressure .*value=\"\(.*\)\" unit.*/pressure.*' )
 
-WD_SPEED=$(fgrep "<speed value=" $TMPFILE | tr -sc '[:alnum:].' ' ' | cut -d " " -f 4)
-WD_DIREC=$(fgrep "<direction value=" $TMPFILE | tr -sc '[:alnum:].' ' ' | cut -d " " -f 4)
+WD_SPEED=$( expr "$OWAPI" : '.*\<speed .*value=\"\(.*\)\" name.*/speed.*' )
+WD_DIREC=$( expr "$OWAPI" : '.*\<direction .*value=\"\(.*\)\" code.*/direction.*' )
 
 cat <<- EOF
 	multigraph $0

From ae13ec95c46f932c638e1aa5aab4d65aa6423e9f Mon Sep 17 00:00:00 2001
From: obma <max@mober.at>
Date: Wed, 7 Oct 2015 17:09:44 +0200
Subject: [PATCH 2/4] p: fix openweather_: set correct name for multigraphs

Set 'plugin_name' with 'basename $0' and use this variable instead of $0 to avoid having the full path as name for the multigraphs.
---
 plugins/weather/openweather_ | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/plugins/weather/openweather_ b/plugins/weather/openweather_
index a7eea886..be62596c 100755
--- a/plugins/weather/openweather_
+++ b/plugins/weather/openweather_
@@ -19,6 +19,7 @@
 # env.apikey XYZ
 
 query_string=$(printf '%s' "${0#*_}" | tr '_' '=')
+plugin_name=$( basename $0 )
 
 OWAPI=$( curl -s "http://api.openweathermap.org/data/2.5/weather?mode=xml&${query_string}")
 # API returns temp in K, we have to convert it in C
@@ -30,7 +31,7 @@ CITY=$( expr "$OWAPI" : '.*\<city.*name=\"\(.*\)\"><coord.*' )
 if [ "$1" = "config" ];
 then
 	cat <<- EOF
-		multigraph $0
+		multigraph $plugin_name
 		graph_title Temperature in ${CITY}
 		graph_vlabel Celsius
 		graph_category weather
@@ -38,7 +39,7 @@ then
 		temp_avg.label avg
 		temp_avg.cdef $KELVIN_BIAS,-
 
-		multigraph $0.temp
+		multigraph $plugin_name.temp
 		graph_title Temperature in ${CITY}
 		graph_vlabel Celsius
 		graph_category weather
@@ -50,28 +51,28 @@ then
 		temp_max.label max
 		temp_max.cdef $KELVIN_BIAS,-
 
-		multigraph $0.humidity
+		multigraph $plugin_name.humidity
 		graph_title Humidity in ${CITY}
 		graph_vlabel %
 		graph_category weather
 		graph_info This graph show the humidity in ${CITY}
 		humidity.label humidity
 
-		multigraph $0.pressure
+		multigraph $plugin_name.pressure
 		graph_title Pressure in ${CITY}
 		graph_vlabel hPa
 		graph_category weather
 		graph_info This graph show the pressure in ${CITY}
 		pressure.label pressure
 
-		multigraph $0.wind_speed
+		multigraph $plugin_name.wind_speed
 		graph_title Wind Speed in ${CITY}
 		graph_vlabel m/s
 		graph_category weather
 		graph_info This graph show the wind speed in ${CITY}
 		speed.label wind speed
 
-		multigraph $0.wind_direction
+		multigraph $plugin_name.wind_direction
 		graph_title Wind direction in ${CITY}
 		graph_vlabel m/s
 		graph_category weather
@@ -94,24 +95,24 @@ WD_SPEED=$( expr "$OWAPI" : '.*\<speed .*value=\"\(.*\)\" name.*/speed.*' )
 WD_DIREC=$( expr "$OWAPI" : '.*\<direction .*value=\"\(.*\)\" code.*/direction.*' )
 
 cat <<- EOF
-	multigraph $0
+	multigraph $plugin_name
 	temp_avg.value	$TEMP_AVG
 
-	multigraph $0.temp
+	multigraph $plugin_name.temp
 	temp_avg.value $TEMP_AVG
 	temp_min.value $TEMP_MIN
 	temp_max.value $TEMP_MAX
 
-	multigraph $0.humidity
+	multigraph $plugin_name.humidity
 	humidity.value $HUMIDITY
 
-	multigraph $0.pressure
+	multigraph $plugin_name.pressure
 	pressure.value $PRESSURE
 
-	multigraph $0.wind_speed
+	multigraph $plugin_name.wind_speed
 	speed.value $WD_SPEED
 
-	multigraph $0.wind_direction
+	multigraph $plugin_name.wind_direction
 	direction.label $WD_DIREC
 EOF
 

From f29c24554bfafa8ed52d6ea29328daad205c28ba Mon Sep 17 00:00:00 2001
From: obma <max@mober.at>
Date: Wed, 7 Oct 2015 18:15:30 +0200
Subject: [PATCH 3/4] p: fix openweather_: returned .label instead of .value
 for wind direction

---
 plugins/weather/openweather_ | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/weather/openweather_ b/plugins/weather/openweather_
index be62596c..fe66a3fe 100755
--- a/plugins/weather/openweather_
+++ b/plugins/weather/openweather_
@@ -113,7 +113,7 @@ cat <<- EOF
 	speed.value $WD_SPEED
 
 	multigraph $plugin_name.wind_direction
-	direction.label $WD_DIREC
+	direction.vaule $WD_DIREC
 EOF
 
 

From ef061fdd9ed41f42cbda69d777d8bf91b7343915 Mon Sep 17 00:00:00 2001
From: obma <max@mober.at>
Date: Sat, 7 Nov 2015 17:41:55 +0100
Subject: [PATCH 4/4] p: openweather_: typo

---
 plugins/weather/openweather_ | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/weather/openweather_ b/plugins/weather/openweather_
index fe66a3fe..0a045607 100755
--- a/plugins/weather/openweather_
+++ b/plugins/weather/openweather_
@@ -113,7 +113,7 @@ cat <<- EOF
 	speed.value $WD_SPEED
 
 	multigraph $plugin_name.wind_direction
-	direction.vaule $WD_DIREC
+	direction.value $WD_DIREC
 EOF