Fixed Dilbert

1 files changed, 11 insertions, 22 deletions

diff --git a/bin/comics/dilbert b/bin/comics/dilbert
index e610b13..6bbb980 100755
--- a/bin/comics/dilbert
+++ b/bin/comics/dilbert
@@ -12,32 +12,21 @@ source "${top}/etc/settings.sh"
 tmp="$(mktemp -d)"
 cd "${tmp}"
 
-server="http://www.dilbert.com"
-webaddress="$server/strips/$(date -d"$daysago days ago" +%Y-%m-%d)/index.html"
+server="http://dilbert.com"
+webaddress="$server/strip/$(date -d"$daysago days ago" +%Y-%m-%d)"
 browser="Mozilla/4.06 [en] (X11; I; Linux 2.0.35 i586)"
 newn="${day}.gif"
 
-wget ${wget_args} --user-agent="$browser" "$webaddress"
+echo "Search $webaddress"
+STRIP=$(curl "$webaddress" | sed -n -re 's#.+class="(.+ |)img-comic[" ].+src="([^"]+).+#\2#p')
+echo "Strip URL $STRIP"
 
-if [ -s index.html ]; then
-    nomen=$(grep -A1 "strips/comic/$(date -d"$daysago days ago" -I)" index.html | \
-            sed -n 's#.*<img.*src="\(http://[^"]\+\)".*#\1#p' | tail -1)
-    gifname=$(sed 's#.*/\([^/]\+\)$#\1#' <<< $nomen)
-
-    if [ -n "${nomen}" ]; then
-        echo "Dateiname: $gifname"
-        echo
-        echo "Hole dilbert von $nomen"
-        echo "fuer Datum: $(date -d"$daysago days ago" -I)"
-        echo
-        wget ${wget_args} --user-agent="$browser" "$nomen"
-
-        if [ -s "${tmp}/${gifname}" ]; then
-            mv "${tmp}/${gifname}" "${image_dir}/$newn"
-            rm -f "${comic_dir}/latest.gif"
-            ln -s "${image_offset}/$newn" "${comic_dir}/latest.gif"
-        fi
-    fi
+if [ -n "$STRIP" ]; then
+	wget ${wget_args} --user-agent="$browser" "$STRIP" -O dilbert.gif
+	mv "dilbert.gif" "${image_dir}/$newn"
+	rm -f "${comic_dir}/latest.gif"
+	ln -s "${image_offset}/$newn" "${comic_dir}/latest.gif"
 fi
 
+cd ..
 rm -rf "${tmp}"