Merge pull request #32 from fantattitude/master

Current_condition is now properly checked on OS X (PCRE Grep not supported on OS X)
erikw · Jul 28, 2012 · 4b14bb7 · 4b14bb7 · tommyolofsson · Jul 28, 2012
2 parents 490e8ab + fac12ab
commit 4b14bb7
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/segments/weather.sh b/segments/weather.sh
@@ -102,7 +102,11 @@ if [ -z "$degrees" ]; then
 			exit 1
 		fi
 		degrees=$(echo "$weather_data" | sed "s|.*<temp_${search_unit} data=\"\([^\"]*\)\"/>.*|\1|")
-		conditions=$(echo "$weather_data" | grep -PZo "<current_conditions>(\\n|.)*</current_conditions>" | grep -PZo "(?<=<condition\sdata=\")([^\"]*)")
+		if [ "$PLATFORM" == "mac" ]; then
+			conditions=$(echo "$weather_data" | grep -EZo "<current_conditions>(\\n|.)*</current_conditions>" | grep -EZo '<condition data="([a-zA-Z ]*)"/>' | sed -n 's/^.*\"\([a-zA-Z ]*\)\".*/\1/p')
+		else
+			conditions=$(echo "$weather_data" | grep -PZo "<current_conditions>(\\n|.)*</current_conditions>" | grep -PZo "(?<=<condition\sdata=\")([^\"]*)")
+		fi
 		echo "$degrees" > $tmp_file
 		echo "$conditions" >> $tmp_file
 	elif [ -f "$tmp_file" ]; then