X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trunk%2Fexec%2Fupdate;h=418cbbffef7f9eb1051f565df4ec0c3bbc7b3907;hb=b6dfec950667b57a5996826a5e4c41e39c288ff0;hp=ee1bd7bc8e3745d52b2e104b29639f1e2a79544e;hpb=0f597b596e696639c86f3a3fe71000bdfb456069;p=cran2deb.git

diff --git a/trunk/exec/update b/trunk/exec/update
index ee1bd7b..418cbbf 100755
--- a/trunk/exec/update
+++ b/trunk/exec/update
@@ -7,14 +7,8 @@
 ## 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;
+cachedir="${CRAN2DEB_CACHE:-/var/cache/cran2deb}/results/"
+pbuildercache="${CRAN2DEB_PBUILDER_CACHE:-/var/cache/pbuilder/}"
 
 umask 002
 root=$1
@@ -25,7 +19,7 @@ fi
 
 shift
 sys=$(cran2deb which_system)
-mkdir -p $(cachedir)/$sys
+mkdir -p "${cachedir}"/"$sys"
 #update_period=10800
 update_period=108
 
@@ -41,13 +35,15 @@ else
 fi
 
 if [ ! -e "${cache_rda}" ] || [ $delta -gt $update_period ]; then
-    mode=create
-    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
-    echo "Executing sudo pbuilder $mode --override-config --configfile /etc/cran2deb/sys/$sys/pbuilderrc"
-    sudo pbuilder $mode --override-config --configfile /etc/cran2deb/sys/$sys/pbuilderrc
+    if [ "${CRAN2DEB_BUILD}" == "yes"]; then
+	mode=create
+	if [ -e "${pbuilder_cache}"/base-cran2deb-$sys.tgz ]; then
+            mode=update
+	fi
+	echo C: sudo pbuilder $mode --override-config --configfile "${CRAN2DEB_CONFDIR:-/etc/cran2deb}"/sys/"$sys"/pbuilderrc
+	echo "Executing sudo pbuilder $mode --override-config --configfile ${CRAN2DEB_CONFDIR:-/etc/cran2deb}/sys/$sys/pbuilderrc"
+	sudo pbuilder $mode --override-config --configfile "${CRAN2DEB_CONFDIR:-/etc/cran2deb}"/sys/"$sys"/pbuilderrc
+    fi;
     echo "Executing $root/exec/update_cache $root"
     $root/exec/update_cache $root
 fi