uppercased the weather options

This commit is contained in:
inxi-svn 2013-05-18 02:25:50 +00:00
parent 65b18f4e0e
commit 601997fc59

20
inxi
View file

@ -10683,18 +10683,18 @@ print_weather_data()
fi fi
if [[ $B_EXTRA_DATA == 'true' ]];then if [[ $B_EXTRA_DATA == 'true' ]];then
if [[ -n ${a_weather[5]} ]];then if [[ -n ${a_weather[5]} ]];then
winds=" ${C1}wind$SEP3${C2} ${a_weather[5]}" winds=" ${C1}Wind$SEP3${C2} ${a_weather[5]}"
fi fi
fi fi
if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
if [[ -n ${a_weather[4]} ]];then if [[ -n ${a_weather[4]} ]];then
humidity=" ${C1}humidity$SEP3${C2} ${a_weather[4]}" humidity=" ${C1}Humidity$SEP3${C2} ${a_weather[4]}"
fi fi
if [[ -n ${a_weather[6]} ]];then if [[ -n ${a_weather[6]} ]];then
pressure="${C1}pressure$SEP3${C2} ${a_weather[6]} " pressure="${C1}Pressure$SEP3${C2} ${a_weather[6]} "
fi fi
fi fi
weather_string="${C1}weather$SEP3${C2} $temp$weather$winds$humidity" weather_string="${C1}Weather$SEP3${C2} $temp$weather$winds$humidity"
if [[ -n ${a_weather[1]} ]];then if [[ -n ${a_weather[1]} ]];then
local_time=" ${a_weather[1]}" local_time=" ${a_weather[1]}"
@ -10716,13 +10716,13 @@ print_weather_data()
print_screen_output "$weather_data" print_screen_output "$weather_data"
if [[ $B_EXTRA_EXTRA_EXTRA_DATA == 'true' ]];then if [[ $B_EXTRA_EXTRA_EXTRA_DATA == 'true' ]];then
if [[ -n ${a_weather[8]} ]];then if [[ -n ${a_weather[8]} ]];then
heat_index="${C1}heat index$SEP3${C2} ${a_weather[8]} " heat_index="${C1}Heat Index$SEP3${C2} ${a_weather[8]} "
fi fi
if [[ -n ${a_weather[9]} ]];then if [[ -n ${a_weather[9]} ]];then
wind_chill="${C1}wind chill$SEP3${C2} ${a_weather[9]} " wind_chill="${C1}Wind Chill$SEP3${C2} ${a_weather[9]} "
fi fi
if [[ -n ${a_weather[7]} ]];then if [[ -n ${a_weather[7]} ]];then
dew_point="${C1}dew point$SEP3${C2} ${a_weather[7]} " dew_point="${C1}Dew Point$SEP3${C2} ${a_weather[7]} "
fi fi
# these were blank in my tests # these were blank in my tests
if [[ -n "$heat_index$wind_chill$dew_point" ]];then if [[ -n "$heat_index$wind_chill$dew_point" ]];then
@ -10735,7 +10735,7 @@ print_weather_data()
print_screen_output "$weather_data" print_screen_output "$weather_data"
if [[ $B_EXTRA_EXTRA_EXTRA_DATA == 'true' ]];then if [[ $B_EXTRA_EXTRA_EXTRA_DATA == 'true' ]];then
if [[ -n ${a_weather[0]} ]];then if [[ -n ${a_weather[0]} ]];then
observation_time="${C1}observation time$SEP3${C2} ${a_weather[0]} " observation_time="${C1}Observation Time$SEP3${C2} ${a_weather[0]} "
fi fi
if [[ $B_OUTPUT_FILTER != 'true' ]];then if [[ $B_OUTPUT_FILTER != 'true' ]];then
if [[ -n ${a_location[0]} ]];then if [[ -n ${a_location[0]} ]];then
@ -10748,9 +10748,9 @@ print_weather_data()
country=" $openP${a_location[5]}$closeP" country=" $openP${a_location[5]}$closeP"
fi fi
if [[ -n ${a_weather[10]} ]];then if [[ -n ${a_weather[10]} ]];then
altitude=" ${C1}altitude$SEP3${C2} ${a_weather[10]}" altitude=" ${C1}Altitude$SEP3${C2} ${a_weather[10]}"
fi fi
location_string="${C1}location$SEP3${C2}$city$state$country$altitude " location_string="${C1}Location$SEP3${C2}$city$state$country$altitude "
fi fi
weather_data=$( create_print_line " " "$location_string$observation_time" ) weather_data=$( create_print_line " " "$location_string$observation_time" )
print_screen_output "$weather_data" print_screen_output "$weather_data"