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

diff --git a/trunk/exec/cran2deb b/trunk/exec/cran2deb
index 3b2794a..73a18bc 100755
--- a/trunk/exec/cran2deb
+++ b/trunk/exec/cran2deb
@@ -2,15 +2,40 @@
 umask 002
 root=$(r -e 'suppressMessages(library(cran2deb));cat(system.file(package="cran2deb"),file=stdout())')
 cmd=$1
-shift
+
+CRAN2DEB_CACHE=/var/cache/cran2deb
+CRAN2DEB_CONFDIR=/etc/cran2deb
+CRAN2DEB_BUILD="yes"
+if [ -r /etc/cran2deb/config ]; then
+    . /etc/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
+    cmd="help"
+fi
+
 if [ ! -x "$root/exec/$cmd" ]; then
     echo unknown command $cmd
     exit 1
 fi
 
-precmd=""
-if [ "$(id -un)" != c2d ]; then
-	precmd="sudo -u c2d -E"
-fi
+shift
 
-$precmd "$root/exec/$cmd" "$root" $*
+# 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
+	$precmd "$root/exec/$cmd" $*
+else
+	$precmd "$root/exec/$cmd" "$root" $*
+fi