start allowing for local user cache configuration

diff --git a/trunk/exec/cran2deb b/trunk/exec/cran2deb
index e47543dfc3922d527b287dd06513980c83ce2e94..5e5e2406d3e5cf68077652346543ed3fa72a8aaa 100755 (executable)
--- a/trunk/exec/cran2deb
+++ b/trunk/exec/cran2deb
@@ -3,6 +3,13 @@ umask 002
 root=$(r -e 'suppressMessages(library(cran2deb));cat(system.file(package="cran2deb"),file=stdout())')
 cmd=$1
 
+if [ -e /etc/cran2deb/config ]; then
+    . /etc/cran2deb/config;
+elif [ -r ~/.cran2deb_config ]; then
+    . ~/.cran2deb_config;
+fi;
+
+
 if [ "x" = "x$cmd" ]; then
     cmd="help"
 fi
@@ -14,10 +21,11 @@ fi
 
 shift
 
-precmd=""
-if [ "$(id -un)" != c2d ]; then
-       precmd="sudo -u c2d -E"
-fi
+# there's no reason not to run cran2deb as a local user
+# precmd=""
+# if [ "$(id -un)" != c2d ]; then
+#      precmd="sudo -u c2d -E"
+# fi
 
 if [ "web" = "$cmd" ]; then 
        # web uses getopt and would be irritated by the "$root" argument

diff --git a/trunk/exec/repopulate b/trunk/exec/repopulate
index 08862dba2da40a7767fccf2cfc76289082e90d08..72e23ccbd13135997e277fb945554a701884bd4b 100755 (executable)
--- a/trunk/exec/repopulate
+++ b/trunk/exec/repopulate
@@ -7,6 +7,13 @@
 set -e
 
 dir=/etc/cran2deb
+if [ -e /etc/cran2deb/config ]; then
+    . /etc/cran2deb/config;
+elif [ -r ~/.cran2deb/config ]; then
+    dir=~/.cran2deb/
+    . ~/.cran2deb/config;
+fi;
+
 if [ ! -d "$dir" ]; then
        echo "Dir $dir not existing."
        exit -1
@@ -16,7 +23,7 @@ umask 002
 echo "Setting 'root' var to '$1'."
 root=$1
 shift
-for x in $(find /etc/cran2deb/ -type f -name '*.in'); do
+for x in $(find "${dir}" -type f -name '*.in'); do
     #echo "x=$x"
     y=$(echo $x | sed -e 's,.in$,,')
     sed -e "s:@ROOT@:$root:g" <"$x" >"$y"

diff --git a/trunk/exec/update b/trunk/exec/update
index d02ece214fc19e4f568797a159d1cb24748e9f9a..ee1bd7bc8e3745d52b2e104b29639f1e2a79544e 100755 (executable)
--- 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