apikey update

arturfriedrich · Jun 5, 2023 · 21b4a1e · 21b4a1e
1 parent 9ee752e
commit 21b4a1e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/current_weather.sh b/current_weather.sh
@@ -2,13 +2,14 @@
 
 source printer.sh
 
-# Set OpenWeatherMap API key, write your own API key here
-apikey=$(cat apikeyfile.txt)
-API_KEY=$apikey
-
 # Define function to retrieve weather information
 get_weather_information() {
     local location=$1
+    local apikey=$2
+
+    # Set OpenWeatherMap API key, write your own API key here
+    apikey=$(cat apikeyfile.txt)
+    API_KEY=$apikey
 
     # Call OpenWeatherMap API and retrieve weather data
     weather_data=$(curl -s "http://api.openweathermap.org/data/2.5/weather?q=${location}&appid=${API_KEY}")

diff --git a/forecast.sh b/forecast.sh
@@ -2,12 +2,13 @@
 
 source printer.sh
 
-# Set OpenWeatherMap API key, write your own API key here
-apikey=$(cat apikeyfile.txt)
-API_KEY=$apikey
-
 get_weather_forecast() {
     local location=$1
+    local apikey=$2
+
+    # Set OpenWeatherMap API key, write your own API key here
+    apikey=$(cat apikeyfile.txt)
+    API_KEY=$apikey
 
     # Call OpenWeatherMap API and retrieve weather forecast data
     forecast_data=$(curl -s "http://api.openweathermap.org/data/2.5/forecast?q=${location}&appid=${API_KEY}")

diff --git a/main.sh b/main.sh
@@ -31,10 +31,10 @@ read -p "Do you want to display the current weather or the forecast for 5 days:
 # Check the value of display_mode and take appropriate action
 if [ "$display_mode" = "c" ]; then
     # Display current weather information
-    get_weather_information "$location"
+    get_weather_information "$location" "$apikey"
 elif [ "$display_mode" = "f" ]; then
     # Display weather forecast for 5 days
-    get_weather_forecast "$location"
+    get_weather_forecast "$location" "$apikey"
 else
     echo "Invalid input!"
 fi