config: move ROOT/etc to /etc/cran2deb

installing a new cran2deb no longer will clobber the previous config.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@123 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

diff --git a/pkg/trunk/R/zzz.R b/pkg/trunk/R/zzz.R
index 7d3584be9dd9fcc7b52c758bb8f37f0508b6cb05..1f4c7290c00d27e857e9a4b19e71b03a10d97bd5 100644 (file)
--- a/pkg/trunk/R/zzz.R
+++ b/pkg/trunk/R/zzz.R
@@ -4,9 +4,9 @@
     global("root", system.file(package='cran2deb'))
     global("cache_root", '/var/cache/cran2deb')
     global("pbuilder_results", '/var/cache/cran2deb/results')
-    global("pbuilder_config", file.path(root,'etc/pbuilderrc'))
-    global("dput_config", file.path(root,'etc/dput.cf'))
-    global("dinstall_config", file.path(root,'etc/mini-dinstall.conf'))
+    global("pbuilder_config", '/etc/cran2deb/pbuilderrc'))
+    global("dput_config", '/etc/cran2deb/dput.cf'))
+    global("dinstall_config", '/etc/cran2deb/mini-dinstall.conf'))
     global("dinstall_archive", file.path(root,'var/archive'))
     global("r_depend_fields", c('Depends','Imports')) # Suggests, Enhances
     # git_revision {

diff --git a/pkg/trunk/exec/update b/pkg/trunk/exec/update
index a2cdf0160d791e4de0cdef38bef2f1d3b9e4acfb..3183356d892ff5b13b25f26090abb58db91904a3 100755 (executable)
--- a/pkg/trunk/exec/update
+++ b/pkg/trunk/exec/update
@@ -8,7 +8,7 @@
 umask 022
 root=$1
 shift
-for (x in `{find $root/etc -type f -name '*.in'}) {
+for (x in `{find /etc/cran2deb -type f -name '*.in'}) {
     y=`{echo $x | sed -e 's,.in$,,'}
     sed -e 's:@ROOT@:'^$root^':g' <$x >$y
 }
@@ -17,7 +17,7 @@ if ([ ! -e $root/var/archive ]) {
     # I symbolically link this into /var/www/
     mkdir $root/var/archive || exit 1
 }
-mini-dinstall --batch -c $root/etc/mini-dinstall.conf || exit 1
+mini-dinstall --batch -c /etc/cran2deb/mini-dinstall.conf || exit 1
 update_period=10800
 if (~ $1 full || ![ -e /var/cache/cran2deb/cache.rda ] ) {
     delta=`{awk 'END{print '^$update_period^'+1}' </dev/null}
@@ -31,7 +31,7 @@ if (![ -e /var/cache/cran2deb/cache.rda ] || [ $delta -gt $update_period ]) {
     if ([ -e /var/cache/pbuilder/base-cran2deb.tgz ]) {
         mode=update
     }
-    sudo pbuilder $mode --override-config --configfile $root/etc/pbuilderrc
+    sudo pbuilder $mode --override-config --configfile /etc/cran2deb/pbuilderrc
     $root/exec/update_cache $root
 }
 if (![ -e /var/cache/cran2deb/cran2deb.db ] || [ $delta -gt $update_period ]) {

diff --git a/pkg/trunk/inst/doc/README b/pkg/trunk/inst/doc/README
index 038e70af199e94d521aecd11bcf958c4c9b0c55c..487103d250f692d101d98c6a959ed4e050f41db8 100644 (file)
--- a/pkg/trunk/inst/doc/README
+++ b/pkg/trunk/inst/doc/README
@@ -17,7 +17,9 @@ Let ROOT be the value returned by running: cran2deb root
 2. ROOT/var/archive should be a symlink pointing to /var/www/cran2deb/
     $ rm ROOT/var/archive
     $ ln -s /var/www/cran2deb/ ROOT/var/archive
-3. modify OTHERMIRROR of ROOT/etc/pbuilderrc.in to point to your webserver
+3. create /etc/cran2deb
+   a. copy ROOT/etc/* into /etc/cran2deb
+   b. modify OTHERMIRROR of /etc/cran2deb/pbuilderrc.in to point to your webserver
 4. cran2deb needs a persistent cache outside of R's control. therefore, create
     /var/cache/cran2deb, writable by whichever user(s) will run cran2deb.
 5. run: cran2deb update

diff --git a/pkg/trunk/inst/etc/dput.cf.in b/pkg/trunk/inst/etc/dput.cf.in
index 7d6b8d29283c6e079ea2a8b451dd2ebc5313d751..4ce816f354024960df517713d37a0ba585581cfe 100644 (file)
--- a/pkg/trunk/inst/etc/dput.cf.in
+++ b/pkg/trunk/inst/etc/dput.cf.in
@@ -4,5 +4,5 @@ incoming = @ROOT@/var/archive/mini-dinstall/incoming
 allow_non-us_software = 1
 run_dinstall = 0
 run_lintian = 1
-post_upload_command = /usr/bin/mini-dinstall --batch -c @ROOT@/etc/mini-dinstall.conf
+post_upload_command = /usr/bin/mini-dinstall --batch -c /etc/cran2deb/mini-dinstall.conf
 allow_unsigned_uploads = 1

diff --git a/pkg/trunk/inst/etc/pbuilderrc.in b/pkg/trunk/inst/etc/pbuilderrc.in
index 07242615c7424ab6634580dc7d2e78c9abcfd4d0..076ee177ae510aff8f0034077eea00eb662b2030 100644 (file)
--- a/pkg/trunk/inst/etc/pbuilderrc.in
+++ b/pkg/trunk/inst/etc/pbuilderrc.in
@@ -1,5 +1,5 @@
 BASETGZ=/var/cache/pbuilder/base-cran2deb.tgz
-HOOKDIR=@ROOT@/etc/hook
+HOOKDIR=/etc/cran2deb/hook
 BUILDRESULT=/var/cache/cran2deb/results
 EXTRAPACKAGES='debhelper r-base-dev cdbs r-base-core lintian xvfb xauth xfonts-base'
 REMOVEPACKAGES='lilo libldap-2.4-2 libopencdk10 libsasl2-2'