projects
/
grml-etc-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3591a4c
)
zshrc: Silence warning in weather() and make func more verbose.
author
Joerg Woelke
<joewoe@fsmail.de>
Fri, 30 Jul 2010 15:19:53 +0000
(17:19 +0200)
committer
Frank Terbeck
<ft@grml.org>
Fri, 30 Jul 2010 17:04:46 +0000
(19:04 +0200)
etc/zsh/zshrc
patch
|
blob
|
history
diff --git
a/etc/zsh/zshrc
b/etc/zsh/zshrc
index
55268d0
..
3f7269a
100644
(file)
--- a/
etc/zsh/zshrc
+++ b/
etc/zsh/zshrc
@@
-4276,34
+4276,39
@@
weather() {
return 1
}
return 1
}
+ local VERBOSE="yes" # TODO: Make this a command line switch
+
+ local ODIR=`pwd`
local PLACE="${1:u}"
local PLACE="${1:u}"
- local
FILE="$HOME/.weather/$PLACE
"
- local LOG="$
HOME/.weather
/log"
+ local
DIR="${HOME}/.weather
"
+ local LOG="$
{DIR}
/log"
- [[ -d $
HOME/.weather
]] || {
- print -n "Creating $
HOME/.weather
: "
- mkdir $
HOME/.weather
+ [[ -d $
{DIR}
]] || {
+ print -n "Creating $
{DIR}
: "
+ mkdir $
{DIR}
print 'done'
}
print "Retrieving information for ${PLACE}:"
print
print 'done'
}
print "Retrieving information for ${PLACE}:"
print
-
wget -T 10 --no-verbose --output-file=$LOG --output-document=$FILE
--timestamping http://weather.noaa.gov/pub/data/observations/metar/decoded/$PLACE.TXT
+
cd ${DIR} && wget -T 10 --no-verbose --output-file=$LOG
--timestamping http://weather.noaa.gov/pub/data/observations/metar/decoded/$PLACE.TXT
if [[ $? -eq 0 ]] ; then
if [[ -n "$VERBOSE" ]] ; then
if [[ $? -eq 0 ]] ; then
if [[ -n "$VERBOSE" ]] ; then
- cat $
FILE
+ cat $
{PLACE}.TXT
else
else
- DATE=$(grep 'UTC' $
FILE
| sed 's#.* /##')
- TEMPERATURE=$(awk '/Temperature/ { print $4" degree Celcius / " $2" degree Fahrenheit" }' $
FILE
| tr -d '(')
+ DATE=$(grep 'UTC' $
{PLACE}.TXT
| sed 's#.* /##')
+ TEMPERATURE=$(awk '/Temperature/ { print $4" degree Celcius / " $2" degree Fahrenheit" }' $
{PLACE}.TXT
| tr -d '(')
echo "date: $DATE"
echo "temp: $TEMPERATURE"
fi
else
print "There was an error retrieving the weather information for $PLACE" >&2
cat $LOG
echo "date: $DATE"
echo "temp: $TEMPERATURE"
fi
else
print "There was an error retrieving the weather information for $PLACE" >&2
cat $LOG
+ cd $ODIR
return 1
fi
return 1
fi
+ cd $ODIR
}
# }}}
}
# }}}