From b6dfec950667b57a5996826a5e4c41e39c288ff0 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Tue, 24 Jan 2012 12:36:47 -0800 Subject: [PATCH] support not building packages --- trunk/exec/cran2deb | 3 ++- trunk/exec/update | 28 ++++++++++++---------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/trunk/exec/cran2deb b/trunk/exec/cran2deb index 4c01d4c..73a18bc 100755 --- a/trunk/exec/cran2deb +++ b/trunk/exec/cran2deb @@ -5,6 +5,7 @@ cmd=$1 CRAN2DEB_CACHE=/var/cache/cran2deb CRAN2DEB_CONFDIR=/etc/cran2deb +CRAN2DEB_BUILD="yes" if [ -r /etc/cran2deb/config ]; then . /etc/cran2deb/config; fi; @@ -12,7 +13,7 @@ if [ -r ~/.cran2deb/config ]; then CRAN2DEB_CONFDIR=~/.cran2deb . ~/.cran2deb/config; fi; -export CRAN2DEB_CACHE CRAN2DEB_CONFDIR +export CRAN2DEB_CACHE CRAN2DEB_CONFDIR CRAN2DEB_BUILD if [ "x" = "x$cmd" ]; then 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 -- 2.39.2