From: Joerg Jaspert <joerg@debian.org>
Date: Fri, 1 Jan 2016 21:39:55 +0000 (+0100)
Subject: Only hardcode path to config if variable isn't set
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=8f72f604a89bb3ff3dba82521dd9fc474208f189;p=dak.git

Only hardcode path to config if variable isn't set

That way we can just set the variable in the crontab file (or users
environment), and do not need to change cronscript (eg. when run on the
security archive)
---

diff --git a/config/debian/cronscript b/config/debian/cronscript
index b9cdf252..2418d79a 100755
--- a/config/debian/cronscript
+++ b/config/debian/cronscript
@@ -47,8 +47,12 @@ shopt -s extglob
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
 
-# import the general variable set.
-export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
+# If run from crontab, CONFIGDIR will point to the correct dir
+# where we find the vars file
+configdir=${configdir:-"/srv/ftp-master.debian.org/dak/config/debian"}
+# import the general variable set. (This will overwrite configdir, but
+# it is expected to have the same value)
+export SCRIPTVARS=${configdir}/vars
 . $SCRIPTVARS
 
 # One arg please