bin/comics: gocomics now uniform and more robust

1 files changed, 11 insertions, 8 deletions

diff --git a/bin/comics/garfield b/bin/comics/garfield
index 21ec88c..5707d04 100755
--- a/bin/comics/garfield
+++ b/bin/comics/garfield
@@ -1,23 +1,26 @@
 #!/bin/bash
 
 source $(pwd)/$(dirname $0)/../../etc/settings.sh
-tmp="$(mktemp -d)"
+tmp=$(mktemp -d)
 cd "${tmp}"
 
-gifname="ga$(date -d "$daysago days ago" +"%y%m%d").gif"
-nomen="http://images.ucomics.com/comics/ga/$year/${gifname}"
 newn="${day}.gif"
+month="$(date -d "$daysago days ago" +%m)"
+server="http://www.gocomics.com/garfield/$year/$month/$day"
 
-echo "Dateiname: $gifname"
+nomen="$(wget ${wget_args} "$server" -O - | grep "class=\"strip\"" | \
+    sed 's#.*<img alt="Garfield"[^<]*src="\([^"]*\)".*#\1#')"
+
+echo "Dateiname: $nomen"
 echo
-echo "Hole garfield von $nomen"
+echo "Hole garfield von $server"
 echo "fuer Datum: $(date -d"$daysago days ago" -I)"
 echo
 
-wget ${wget_args} --user-agent=Mozilla "$nomen"
+wget ${wget_args} "$nomen" -O "$newn"
 
-if [ -e "${tmp}/${gifname}" ]; then
-    mv "${tmp}/${gifname}" "${image_dir}/$newn"
+if [ -e "${tmp}/$newn}" ]; then
+    mv "${tmp}/${newn}" "${image_dir}/$newn"
     rm -f "${comic_dir}/latest.gif"
     ln -s "${image_offset}/$newn" "${comic_dir}/latest.gif"
 fi