X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trunk%2Fexec%2Fcran2deb;h=73a18bcc57e55cd2540ffc795fc33a56245668eb;hb=b6dfec950667b57a5996826a5e4c41e39c288ff0;hp=5e5e2406d3e5cf68077652346543ed3fa72a8aaa;hpb=d4ce54fa9729743502cb3962975105cacde5feb5;p=cran2deb.git

diff --git a/trunk/exec/cran2deb b/trunk/exec/cran2deb
index 5e5e240..73a18bc 100755
--- a/trunk/exec/cran2deb
+++ b/trunk/exec/cran2deb
@@ -3,11 +3,17 @@ 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
+CRAN2DEB_BUILD="yes"
+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 CRAN2DEB_BUILD
 
 
 if [ "x" = "x$cmd" ]; then