X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trunk%2Fexec%2Fupdate;h=ee1bd7bc8e3745d52b2e104b29639f1e2a79544e;hb=HEAD;hp=d02ece214fc19e4f568797a159d1cb24748e9f9a;hpb=9a585e579f3cb0fbf62870629e2e8530f47510ae;p=cran2deb.git

diff --git a/trunk/exec/update b/trunk/exec/update
index d02ece2..ee1bd7b 100755
--- a/trunk/exec/update
+++ b/trunk/exec/update
@@ -7,6 +7,14 @@
 ## DOC:
 
 set -e
+cachedir="/var/cache/cran2deb/results/"
+pbuildercache="/var/cache/pbuilder/"
+
+if [ -e /etc/cran2deb/config ]; then
+    . /etc/cran2deb/config;
+elif [ -r ~/.cran2deb_config ]; then
+    . ~/.cran2deb_config;
+fi;
 
 umask 002
 root=$1
@@ -17,23 +25,24 @@ fi
 
 shift
 sys=$(cran2deb which_system)
-mkdir -p /var/cache/cran2deb/results/$sys
+mkdir -p $(cachedir)/$sys
 #update_period=10800
 update_period=108
 
-if [ ! $1 = full ] || [ ! -e /var/cache/cran2deb/cache.rda ]; then
+cache_rda="${cachedir}/cache.rda"
+if [ ! $1 = full ] || [ ! -e "${cache_rda}" ]; then
     delta=$(($update_period+1))
     echo Forcing cache update
 else
     seconds_time=$(date +%s)
-    seconds_file=$(stat -c '%Y' /var/cache/cran2deb/cache.rda)
+    seconds_file=$(stat -c '%Y' "${cache_rda}")
     delta=$(($seconds_time-$seconds_file))
     echo Cache is $delta seconds out of date, auto-update after $update_period seconds.
 fi
 
-if [ ! -e /var/cache/cran2deb/cache.rda ] || [ $delta -gt $update_period ]; then
+if [ ! -e "${cache_rda}" ] || [ $delta -gt $update_period ]; then
     mode=create
-    if [ -e /var/cache/pbuilder/base-cran2deb-$sys.tgz ]; then
+    if [ -e "${pbuilder_cache}"/base-cran2deb-$sys.tgz ]; then
         mode=update
     fi
     echo C: sudo pbuilder $mode --override-config --configfile /etc/cran2deb/sys/$sys/pbuilderrc