Add an option to disable the location information in the weather
This commit is contained in:
parent
8cf4901842
commit
f5c0789d07
3 changed files with 16 additions and 11 deletions
|
@ -21,6 +21,7 @@ main()
|
||||||
show_network=$(get_tmux_option "@dracula-show-network" true)
|
show_network=$(get_tmux_option "@dracula-show-network" true)
|
||||||
show_weather=$(get_tmux_option "@dracula-show-weather" true)
|
show_weather=$(get_tmux_option "@dracula-show-weather" true)
|
||||||
show_fahrenheit=$(get_tmux_option "@dracula-show-fahrenheit" true)
|
show_fahrenheit=$(get_tmux_option "@dracula-show-fahrenheit" true)
|
||||||
|
show_location=$(get_tmux_option "@dracula-show-location" true)
|
||||||
show_powerline=$(get_tmux_option "@dracula-show-powerline" false)
|
show_powerline=$(get_tmux_option "@dracula-show-powerline" false)
|
||||||
show_flags=$(get_tmux_option "@dracula-show-flags" false)
|
show_flags=$(get_tmux_option "@dracula-show-flags" false)
|
||||||
show_left_icon=$(get_tmux_option "@dracula-show-left-icon" smiley)
|
show_left_icon=$(get_tmux_option "@dracula-show-left-icon" smiley)
|
||||||
|
@ -70,7 +71,7 @@ main()
|
||||||
|
|
||||||
# start weather script in background
|
# start weather script in background
|
||||||
if $show_weather; then
|
if $show_weather; then
|
||||||
$current_dir/sleep_weather.sh $show_fahrenheit &
|
$current_dir/sleep_weather.sh $show_fahrenheit $show_location &
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Set timezone unless hidden by configuration
|
# Set timezone unless hidden by configuration
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#wrapper script for running weather on interval
|
#wrapper script for running weather on interval
|
||||||
|
|
||||||
fahrenheit=$1
|
fahrenheit=$1
|
||||||
|
location=$2
|
||||||
|
|
||||||
LOCKFILE=/tmp/.dracula-tmux-weather.lock
|
LOCKFILE=/tmp/.dracula-tmux-weather.lock
|
||||||
|
|
||||||
|
@ -27,7 +28,7 @@ main()
|
||||||
|
|
||||||
while tmux has-session &> /dev/null
|
while tmux has-session &> /dev/null
|
||||||
do
|
do
|
||||||
$current_dir/weather.sh $fahrenheit > $current_dir/../data/weather.txt
|
$current_dir/weather.sh $fahrenheit $location > $current_dir/../data/weather.txt
|
||||||
if tmux has-session &> /dev/null
|
if tmux has-session &> /dev/null
|
||||||
then
|
then
|
||||||
sleep 1200
|
sleep 1200
|
||||||
|
|
|
@ -1,15 +1,19 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
|
||||||
fahrenheit=$1
|
fahrenheit=$1
|
||||||
|
location=$2
|
||||||
|
|
||||||
load_request_params()
|
display_location()
|
||||||
{
|
{
|
||||||
|
if $location; then
|
||||||
city=$(curl -s https://ipinfo.io/city 2> /dev/null)
|
city=$(curl -s https://ipinfo.io/city 2> /dev/null)
|
||||||
region=$(curl -s https://ipinfo.io/region 2> /dev/null)
|
region=$(curl -s https://ipinfo.io/region 2> /dev/null)
|
||||||
|
echo " $city, $region"
|
||||||
|
else
|
||||||
|
echo ''
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
fetch_weather_information()
|
fetch_weather_information()
|
||||||
{
|
{
|
||||||
display_weather=$1
|
display_weather=$1
|
||||||
|
@ -53,10 +57,9 @@ forecast_unicode()
|
||||||
|
|
||||||
main()
|
main()
|
||||||
{
|
{
|
||||||
load_request_params
|
|
||||||
# process should be cancelled when session is killed
|
# process should be cancelled when session is killed
|
||||||
if ping -q -c 1 -W 1 ipinfo.io &>/dev/null; then
|
if ping -q -c 1 -W 1 ipinfo.io &>/dev/null; then
|
||||||
echo "$(display_weather) $city, $region"
|
echo "$(display_weather)$(display_location)"
|
||||||
else
|
else
|
||||||
echo "Location Unavailable"
|
echo "Location Unavailable"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue