From 2e446bd47155e8cd052d4b907e41477515f0eefe Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 2 Oct 2014 11:47:52 -0300
Subject: Uploading version 0.7.1

---
 src/bin/open-1 | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'src/bin/open-1')

diff --git a/src/bin/open-1 b/src/bin/open-1
index b4ddaa8..44a8840 100644
--- a/src/bin/open-1
+++ b/src/bin/open-1
@@ -11,12 +11,13 @@ LU=`cat ~/.brweather/cache/lastupdate`
 ODATE=`date "+%d-%m-%Y"`
 DAY0=`date "+%a"`
 
-ALT=$(echo awk -F"[,:]" '{for(i=1;i<=NF;i++){if($i~/temp_min\042/){print$(i+1)}}}')
-AHT=$(echo awk -F"[,:]" '{for(i=1;i<=NF;i++){if($i~/temp_max\042/){print$(i+1)}}}')
+ALT=$(echo awk -F"[,:]" '{for(i=1;i<=NF;i++){if($i~/min\042/){print$(i+1)}}}')
+AHT=$(echo awk -F"[,:]" '{for(i=1;i<=NF;i++){if($i~/max\042/){print$(i+1)}}}')
 APA=$(echo awk -F"[,:]" '{for(i=1;i<=NF;i++){if($i~/pressure\042/){print$(i+1)}}}')
 AUM=$(echo awk -F"[,:]" '{for(i=1;i<=NF;i++){if($i~/humidity\042/){print$(i+1)}}}')
 AWS=$(echo awk -F"[,:]" '{for(i=1;i<=NF;i++){if($i~/speed\042/){print$(i+1)}}}')
 ACA=$(echo awk -F"[,:]" '{for(i=1;i<=NF;i++){if($i~/all\042/){print$(i+1)}}}')
+ACA2=$(echo awk -F"[,:]" '{for(i=1;i<=NF;i++){if($i~/"clouds\042/){print$(i+1)}}}')
 
 D1=$(echo grep -m1 $(date +%a) ~/.brweather/cache/open2)
 DAY1=$(grep -m1 $(date +%a) ~/.brweather/cache/open2 | cut -f2 -d':')
@@ -106,7 +107,7 @@ case $1 in
 #;;
 # "--option=LUS") echo $LUS
 ;;
-"--option=TN") printf "%.0f\n" $(echo $(awk -F"[,:]" '{for(i=1;i<=NF;i++){if($i~/temp\042/){print$(i+1)}}}' ~/.brweather/cache/open1) - 273.15 | bc | sed 's/\./,/ ; s/}//g')
+"--option=TN") printf "%.0f\n" $(echo $(awk -F"[,:]" '{for(i=1;i<=NF;i++){if($i~/temp\042/){print$(i+1)}}}' ~/.brweather/cache/open1) | sed 's/\./,/ ; s/}//g')
 ;;
 "--option=umid") echo $($AUM ~/.brweather/cache/open1 | sed 's/}//g')
 ;;
@@ -122,29 +123,29 @@ case $1 in
 ;;
 "--option=Day1T") echo $DAY1T
 ;;
-"--option=LT1") printf "%.0f\n" $(echo $($D1 | $ALT) - 273.15 | bc | sed 's/\./,/ ; s/}//g')
+"--option=LT1") printf "%.0f\n" $(echo $($D1 | $ALT) | sed 's/\./,/ ; s/}//g')
 ;;
-"--option=HT1") printf "%.0f\n" $(echo $($D1 | $AHT) - 273.15 | bc | sed 's/\./,/ ; s/}//g')
+"--option=HT1") printf "%.0f\n" $(echo $($D1 | $AHT) | sed 's/\./,/ ; s/}//g')
 ;;
-"--option=PA1") echo $(echo $($D1 | $APA))
+"--option=PA1") echo $($D1 | $APA)
 ;;
-"--option=umid1") echo $(echo $($D1 | $AUM) | sed 's/}//g')
+"--option=umid1") echo $($D1 | $AUM) | sed 's/}//g'
 ;;
-"--option=CLD1") echo $(echo $($D1 | $ACA) | sed 's/}//g')
+"--option=CLD1") echo $($D1 | $ACA2) | sed 's/}//g'
 ;;
 "--option=Day2") echo $DAY2
 ;;
 "--option=Day2T") echo $DAY2T
 ;;
-"--option=LT2") printf "%.0f\n" $(echo $(echo $D2 | $ALT) - 273.15 | bc | sed 's/\./,/ ; s/}//g')
+"--option=LT2") printf "%.0f\n" $(echo $(echo $D2 | $ALT) | sed 's/\./,/ ; s/}//g')
 ;;
-"--option=HT2") printf "%.0f\n" $(echo $(echo $D2 | $AHT) - 273.15 | bc | sed 's/\./,/ ; s/}//g')
+"--option=HT2") printf "%.0f\n" $(echo $(echo $D2 | $AHT) | sed 's/\./,/ ; s/}//g')
 ;;
-"--option=PA2") echo $(echo $(echo $D2 | $APA) | sed 's/}//g')
+"--option=PA2") echo $D2 | $APA | sed 's/}//g'
 ;;
-"--option=umid2") echo $(echo $(echo $D2 | $AUM) | sed 's/}//g')
+"--option=umid2") echo $D2 | $AUM | sed 's/}//g'
 ;;
-"--option=CLD2") echo $(echo $(echo $D2 | $ACA))
+"--option=CLD2") echo $D2 | $ACA2 | sed 's/}//g'
 ;;
 "--option=Day3T") echo $DAY3T
 ;;
-- 
cgit v1.2.3