From 402148c4076a4ca5aa2959283f4ce5af6055b3ab Mon Sep 17 00:00:00 2001
From: Mariusz Aleszko <marale1@st.amu.edu.pl>
Date: Thu, 25 Jan 2018 20:46:59 +0000
Subject: [PATCH] Zaktualizuj 'weather.sh'

---
 weather.sh | 63 +++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 20 deletions(-)

diff --git a/weather.sh b/weather.sh
index 6cf73a3..27223eb 100644
--- a/weather.sh
+++ b/weather.sh
@@ -10,8 +10,12 @@ do
 	l) LOCATION="$OPTARG";;
 	d) DYNAMIC=true;;
 	f) FAHRENHEIT=true;;
-	?) echo "Niepoprawna opcja: -$OPTARG"
-	   exit ;;
+	\?) echo "Bledna opcja: -$OPTARG" >&2
+     	exit 1
+        ;;
+        :)echo "Opcja -$OPTARG wymaga argumentu" >&2
+        exit 1
+        ;;
 	esac
 done
 DATE=$(date -r /tmp/$LOCATION.json +%s)
@@ -25,23 +29,30 @@ function weather {
 
 	JSON=$(cat /tmp/$LOCATION.json)
     clear 
-    echo "Kraj $(echo $JSON | jq -r '.location.country')"
-    echo "Miasto $(echo $JSON | jq -r '.location.name')"
-	if $FAHRENHEIT == true 
-	then
-		echo "Temperatura $(echo $JSON | jq -r '.current.temp_f') °F"
-	else
-		echo "Temperatura $(echo $JSON | jq -r '.current.temp_c') °C"
-	fi
-	if $FAHRENHEIT == true
-	then
-		echo "Temperatura odczuwalna $(echo $JSON | jq -r '.current.feelslike_f') °F"
-	else
-		echo "Temperatura odczuwalna $(echo $JSON | jq -r '.current.feelslike_c') °C"
-	fi
-    echo "Predkosc wiatru $(echo $JSON | jq -r '.current.wind_kph') km/h"
-    echo "Cisnienie $(echo $JSON | jq -r '.current.pressure_mb') hPa"
-    echo "Wilgotnosc $(echo $JSON | jq -r '.current.humidity') %"
+if [ $FAHRENHEIT != true ]; then
+    echo "Kraj  $(echo $JSON | jq -r '.location.country')"
+    echo "Miasto  $(echo $JSON | jq -r '.location.name')"
+    echo "Czas lokalny $(echo $JSON | jq -r '.location.localtime')"
+    echo "Temperatura  $(echo $JSON | jq -r '.current.temp_c') °C"
+    echo "Temperatura odczuwalna  $(echo $JSON | jq -r '.current.feelslike_c') °C"
+    echo "Predkosc wiatru  $(echo $JSON | jq -r '.current.wind_kph') km/h"
+    echo "Cisnienie  $(echo $JSON | jq -r '.current.pressure_mb') hPa"
+    echo "Opad  $(echo $JSON | jq -r '.current.precip_mm') mm"
+    echo "Wilgotnosc  $(echo $JSON | jq -r '.current.humidity') %"
+    echo "Ostatnia aktualizacja  $(echo $JSON | jq -r '.current.last_updated')"
+else
+    echo "Kraj  $(echo $JSON | jq -r '.location.country')"
+    echo "Miasto  $(echo $JSON | jq -r '.location.name')"
+    echo "Czas lokalny $(echo $JSON | jq -r '.location.localtime')"
+    echo "Temperatura  $(echo $JSON | jq -r '.current.temp_f') °F"
+    echo "Temperatura odczuwalna  $(echo $JSON | jq -r '.current.feelslike_f') °F"
+    echo "Predkosc wiatru  $(echo $JSON | jq -r '.current.wind_mph') mph"
+    echo "Cisnienie  $(echo $JSON | jq -r '.current.pressure_in') inHg"
+    echo "Opad  $(echo $JSON | jq -r '.current.precip_in') inches"
+    echo "Wilgotnosc  $(echo $JSON | jq -r '.current.humidity') %"
+    echo "Ostatnia aktualizacja  $(echo $JSON | jq -r '.current.last_updated')"
+fi
+
 }
 if $DYNAMIC == true 
 	then
@@ -53,4 +64,16 @@ if $DYNAMIC == true
 else
 
 	weather
-fi
\ No newline at end of file
+fi
+	 
+
+
+	
+
+
+ 
+  
+ 
+ 
+
+