Merge branch 'master' into dev
This commit is contained in:
commit
7f937a2902
25
bin/weather
25
bin/weather
|
@ -14,23 +14,34 @@ _check_date() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
main() {
|
weather_loop() {
|
||||||
if [ "$1" == "startup" ]; then
|
if [ $# -gt 0 ]
|
||||||
_check_date
|
then
|
||||||
if [ $? -ne 0 ]; then
|
for ((i=1; i<=$#; i++)); do
|
||||||
curl --retry 10 --connect-timeout 20 wttr.in 2>/dev/null
|
curl --retry 10 --connect-timeout 20 wttr.in/${!i} 2>/dev/null
|
||||||
|
done
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
date +%d/%m/%Y > ~/.config/dotfiles/.data/weather_date
|
date +%d/%m/%Y > ~/.config/dotfiles/.data/weather_date
|
||||||
else
|
else
|
||||||
echo -e "\033[31;1mNetwork unavailable, please check your connexion or try again later.\033[0m"
|
echo -e "\033[31;1mNetwork unavailable, please check your connexion or try again later.\033[0m"
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
curl --retry 10 --connect-timeout 20 wttr.in 2>/dev/null
|
curl --retry 10 --connect-timeout 20 wttr.in 2>/dev/null
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
echo -e "\033[31;1mNetwork unavailable, please check your connexion or try again later.\033[0m"
|
echo -e "\033[31;1mNetwork unavailable, please check your connexion or try again later.\033[0m"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
main() {
|
||||||
|
if [ "$1" == "startup" ]; then
|
||||||
|
_check_date
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
weather_loop ${@:2}
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
weather_loop $@
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
main $@
|
main $@
|
||||||
|
|
Loading…
Reference in New Issue