bin/comics: check if comic is available before downloading an invalid url

3 files changed, 41 insertions, 33 deletions

diff --git a/bin/comics/claybennett b/bin/comics/claybennett
index 9da803b..9469cba 100755
--- a/bin/comics/claybennett
+++ b/bin/comics/claybennett
@@ -14,23 +14,27 @@ url_regex=".*<guid>\([^<]*\)</guid>.*"
 
 post=$(wget ${wget_args} -O - "${rss}" | grep "${rss_regex}" | sed "s#${url_regex}#\1#")
 
-# get img url from post
-img=$(wget ${wget_args} -O - "${post}" | grep '<div class="story_lead_photo">' -A 3 | \
-      sed -n 's#.*<img.*src="\([^"]*\)".*#\1#p')
+if [ -n "${post}" ]; then
+    # get img url from post
+    img=$(wget ${wget_args} -O - "${post}" | grep '<div class="story_lead_photo">' -A 3 | \
+        sed -n 's#.*<img.*src="\([^"]*\)".*#\1#p')
+fi
 
-echo "Hole claybennett von $server"
-echo "fuer Datum: $(date -d"$daysago days ago" -I)"
-echo "URL: $img"
-echo
+if [ -n "${img}" ]; then
+    echo "Hole claybennett von $server"
+    echo "fuer Datum: $(date -d"$daysago days ago" -I)"
+    echo "URL: $img"
+    echo
 
-wget ${wget_args} "${img}" -O "${newn}"
+    wget ${wget_args} "${img}" -O "${newn}"
 
-echo ${image_dir}
+    echo ${image_dir}
 
-if [ -s "${tmp}/${newn}" ]; then
-    mv "${tmp}/${newn}" "${image_dir}/$newn"
-    rm -f "${comic_dir}/latest.jpg"
-    ln -s "${image_offset}/$newn" "${comic_dir}/latest.jpg"
+    if [ -s "${tmp}/${newn}" ]; then
+        mv "${tmp}/${newn}" "${image_dir}/$newn"
+        rm -f "${comic_dir}/latest.jpg"
+        ln -s "${image_offset}/$newn" "${comic_dir}/latest.jpg"
+    fi
 fi
 
 rm -rf "${tmp}"
diff --git a/bin/comics/dilbert b/bin/comics/dilbert
index 1771658..7822309 100755
--- a/bin/comics/dilbert
+++ b/bin/comics/dilbert
@@ -16,17 +16,19 @@ if [ -s index.html ]; then
             sed -n 's#.*<img.*src="\(http://[^"]\+\)".*#\1#p' | tail -1)
     gifname=$(sed 's#.*/\([^/]\+\)$#\1#' <<< $nomen)
 
-    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 [ -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"
+        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
 fi
 
diff --git a/bin/comics/userfriendly b/bin/comics/userfriendly
index 4075d38..54137c9 100755
--- a/bin/comics/userfriendly
+++ b/bin/comics/userfriendly
@@ -15,16 +15,18 @@ url_regex='.*<img[^>]*src="\([^"]*\)".*'
 
 img=$(wget ${wget_args} -U "$browser" -O - "${page}" | grep "${page_regex}" | sed "s#${url_regex}#\1#")
 
-echo "Hole userfriendly von $img"
-echo "fuer Datum: $(date -d"$daysago days ago" -I)"
-echo
-
-wget ${wget_args} "${img}" -U "$browser" -O "${newn}"
-
-if [ -s "${tmp}/${newn}" ]; then
-    mv "${tmp}/${newn}" "${image_dir}/$newn"
-    rm -f "${comic_dir}/latest.gif"
-    ln -s "${image_offset}/$newn" "${comic_dir}/latest.gif"
+if [ -n "${img}" ]; then
+    echo "Hole userfriendly von $img"
+    echo "fuer Datum: $(date -d"$daysago days ago" -I)"
+    echo
+
+    wget ${wget_args} "${img}" -U "$browser" -O "${newn}"
+
+    if [ -s "${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
 fi
 
 rm -rf "${tmp}"