bin: supply top directory to fetch scripts

If calling get-commics with absolute pathe the fetching scripts got
something like /var/www/comics.spline.de//var/www/comics.spline.de/
as absolute path. This fixes this issue by changing the working
directory to the top level directory and getting the path with $(pwd)
one time and supply the top directory to the fetching scripts as first
argument.

12 files changed, 112 insertions, 23 deletions

diff --git a/bin/comics/calvin b/bin/comics/calvin
index 1cfd0ec..edbe7e6 100755
--- a/bin/comics/calvin
+++ b/bin/comics/calvin
@@ -1,7 +1,15 @@
 #!/bin/bash
 
-source $(pwd)/$(dirname $0)/../../etc/settings.sh
-tmp=$(mktemp -d)
+if [ -z "$1" -o ! -d "$1" ]; then
+    echo "Usage: $0 <top-directory> [<days ago>]" 1>&2
+    exit 1
+fi
+
+top="${1}"
+shift
+
+source "${top}/etc/settings.sh"
+tmp="$(mktemp -d)"
 cd "${tmp}"
 
 newn="${day}.gif"
diff --git a/bin/comics/claybennett b/bin/comics/claybennett
index 9469cba..da8ca8c 100755
--- a/bin/comics/claybennett
+++ b/bin/comics/claybennett
@@ -1,7 +1,15 @@
 #!/bin/bash
 
-source $(pwd)/$(dirname $0)/../../etc/settings.sh
-tmp=$(mktemp -d)
+if [ -z "$1" -o ! -d "$1" ]; then
+    echo "Usage: $0 <top-directory> [<days ago>]" 1>&2
+    exit 1
+fi
+
+top="${1}"
+shift
+
+source "${top}/etc/settings.sh"
+tmp="$(mktemp -d)"
 cd "${tmp}"
 
 date="$(date -d "$daysago days ago" +"%a, %d %b %Y")"
diff --git a/bin/comics/dilbert b/bin/comics/dilbert
index 7822309..e610b13 100755
--- a/bin/comics/dilbert
+++ b/bin/comics/dilbert
@@ -1,6 +1,14 @@
 #!/bin/bash
 
-source $(pwd)/$(dirname $0)/../../etc/settings.sh
+if [ -z "$1" -o ! -d "$1" ]; then
+    echo "Usage: $0 <top-directory> [<days ago>]" 1>&2
+    exit 1
+fi
+
+top="${1}"
+shift
+
+source "${top}/etc/settings.sh"
 tmp="$(mktemp -d)"
 cd "${tmp}"
 
diff --git a/bin/comics/garfield b/bin/comics/garfield
index 79fd431..4aaecfe 100755
--- a/bin/comics/garfield
+++ b/bin/comics/garfield
@@ -1,7 +1,15 @@
 #!/bin/bash
 
-source $(pwd)/$(dirname $0)/../../etc/settings.sh
-tmp=$(mktemp -d)
+if [ -z "$1" -o ! -d "$1" ]; then
+    echo "Usage: $0 <top-directory> [<days ago>]" 1>&2
+    exit 1
+fi
+
+top="${1}"
+shift
+
+source "${top}/etc/settings.sh"
+tmp="$(mktemp -d)"
 cd "${tmp}"
 
 newn="${day}.gif"
diff --git a/bin/comics/geekandpoke b/bin/comics/geekandpoke
index d9e46bc..11c4360 100755
--- a/bin/comics/geekandpoke
+++ b/bin/comics/geekandpoke
@@ -1,6 +1,14 @@
 #!/bin/bash
 
-source $(pwd)/$(dirname $0)/../../etc/settings.sh
+if [ -z "$1" -o ! -d "$1" ]; then
+    echo "Usage: $0 <top-directory> [<days ago>]" 1>&2
+    exit 1
+fi
+
+top="${1}"
+shift
+
+source "${top}/etc/settings.sh"
 tmp="$(mktemp -d)"
 cd "${tmp}"
 
diff --git a/bin/comics/nichtlustig b/bin/comics/nichtlustig
index f8037c4..351950d 100755
--- a/bin/comics/nichtlustig
+++ b/bin/comics/nichtlustig
@@ -1,5 +1,14 @@
 #!/bin/bash
-source $(pwd)/$(dirname $0)/../../etc/settings.sh
+
+if [ -z "$1" -o ! -d "$1" ]; then
+    echo "Usage: $0 <top-directory> [<days ago>]" 1>&2
+    exit 1
+fi
+
+top="${1}"
+shift
+
+source "${top}/etc/settings.sh"
 tmp="$(mktemp -d)"
 cd "${tmp}"
 
diff --git a/bin/comics/snoopy b/bin/comics/snoopy
index 9be0c14..5157591 100755
--- a/bin/comics/snoopy
+++ b/bin/comics/snoopy
@@ -1,7 +1,15 @@
 #!/bin/bash
 
-source $(pwd)/$(dirname $0)/../../etc/settings.sh
-tmp=$(mktemp -d)
+if [ -z "$1" -o ! -d "$1" ]; then
+    echo "Usage: $0 <top-directory> [<days ago>]" 1>&2
+    exit 1
+fi
+
+top="${1}"
+shift
+
+source "${top}/etc/settings.sh"
+tmp="$(mktemp -d)"
 cd "${tmp}"
 
 newn="${day}.gif"
diff --git a/bin/comics/touche b/bin/comics/touche
index 171d007..07f796a 100755
--- a/bin/comics/touche
+++ b/bin/comics/touche
@@ -1,7 +1,15 @@
 #!/bin/bash
 
-source $(pwd)/$(dirname $0)/../../etc/settings.sh
-tmp=$(mktemp -d)
+if [ -z "$1" -o ! -d "$1" ]; then
+    echo "Usage: $0 <top-directory> [<days ago>]" 1>&2
+    exit 1
+fi
+
+top="${1}"
+shift
+
+source "${top}/etc/settings.sh"
+tmp="$(mktemp -d)"
 cd "${tmp}"
 
 newn="${day}.gif"
diff --git a/bin/comics/userfriendly b/bin/comics/userfriendly
index 54137c9..177dc57 100755
--- a/bin/comics/userfriendly
+++ b/bin/comics/userfriendly
@@ -1,7 +1,15 @@
 #!/bin/bash
 
-source $(pwd)/$(dirname $0)/../../etc/settings.sh
-tmp=$(mktemp -d)
+if [ -z "$1" -o ! -d "$1" ]; then
+    echo "Usage: $0 <top-directory> [<days ago>]" 1>&2
+    exit 1
+fi
+
+top="${1}"
+shift
+
+source "${top}/etc/settings.sh"
+tmp="$(mktemp -d)"
 cd "${tmp}"
 
 browser="Mozilla/4.06 [en] (X11; I; Linux 2.0.35 i586)"
diff --git a/bin/comics/xkcd b/bin/comics/xkcd
index 5af680b..7079294 100755
--- a/bin/comics/xkcd
+++ b/bin/comics/xkcd
@@ -1,7 +1,15 @@
 #!/bin/bash
 
-source $(pwd)/$(dirname $0)/../../etc/settings.sh
-tmp=$(mktemp -d)
+if [ -z "$1" -o ! -d "$1" ]; then
+    echo "Usage: $0 <top-directory> [<days ago>]" 1>&2
+    exit 1
+fi
+
+top="${1}"
+shift
+
+source "${top}/etc/settings.sh"
+tmp="$(mktemp -d)"
 cd "${tmp}"
 
 browser="Mozilla/4.76 [de] (X11; U; Linux 2.2.18 i586)"
diff --git a/bin/comics/zits b/bin/comics/zits
index 8724116..579e745 100755
--- a/bin/comics/zits
+++ b/bin/comics/zits
@@ -1,7 +1,15 @@
 #!/bin/bash
 
-source $(pwd)/$(dirname $0)/../../etc/settings.sh
-tmp=$(mktemp -d)
+if [ -z "$1" -o ! -d "$1" ]; then
+    echo "Usage: $0 <top-directory> [<days ago>]" 1>&2
+    exit 1
+fi
+
+top="${1}"
+shift
+
+source "${top}/etc/settings.sh"
+tmp="$(mktemp -d)"
 cd "${tmp}"
 
 newn="${day}.gif"
diff --git a/bin/get-comics b/bin/get-comics
index 73f6d39..472344d 100755
--- a/bin/get-comics
+++ b/bin/get-comics
@@ -11,16 +11,16 @@ else
 	daysago=$1
 fi
 
-top="$(pwd)/$(dirname $0)/../"
-for update in comics/* ; do
+top="$( cd "$(dirname "$0")/../" >/dev/null 2>&1 && pwd )"
+for update in ${top}/bin/comics/* ; do
 
 	comic=$(basename $update)
 	if [ "$output" = "true" ]; then
-		${update} $daysago &
+		${update} "${top}" "${daysago}" &
 	else
                 myDate=$(date -Im --date "$daysago days ago")
 		echo "---------------- $myDate ----------------" >> ${top}/log/${comic}.log
-		${update} $daysago >> ${top}/log/${comic}.log 2>&1 &
+		${update} "${top}" "${daysago}" >> ${top}/log/${comic}.log 2>&1 &
 	fi
 
 	sleep 2