use CRAN2DEB_CACHE and CRAN2DEB_CONFDIR env variables

[cran2deb.git] / trunk / exec / cran2deb

diff --git a/trunk/exec/cran2deb b/trunk/exec/cran2deb
index 5e5e2406d3e5cf68077652346543ed3fa72a8aaa..4c01d4cb3073628091002d218a643e7d01eda22f 100755 (executable)
--- a/trunk/exec/cran2deb
+++ b/trunk/exec/cran2deb
@@ -3,11 +3,16 @@ umask 002
 root=$(r -e 'suppressMessages(library(cran2deb));cat(system.file(package="cran2deb"),file=stdout())')
 cmd=$1
 
-if [ -e /etc/cran2deb/config ]; then
+CRAN2DEB_CACHE=/var/cache/cran2deb
+CRAN2DEB_CONFDIR=/etc/cran2deb
+if [ -r /etc/cran2deb/config ]; then
     . /etc/cran2deb/config;
-elif [ -r ~/.cran2deb_config ]; then
-    . ~/.cran2deb_config;
 fi;
+if [ -r ~/.cran2deb/config ]; then
+    CRAN2DEB_CONFDIR=~/.cran2deb
+    . ~/.cran2deb/config;
+fi;
+export CRAN2DEB_CACHE CRAN2DEB_CONFDIR
 
 
 if [ "x" = "x$cmd" ]; then