make update use mini-dinstall config from system-depenent config (oops!)

[cran2deb.git] / branch / multisys / exec / update

diff --git a/branch/multisys/exec/update b/branch/multisys/exec/update
index 80565ba1a944dcdb7692063a247160069c54d6e6..bca99139b3819f4dc5f4c3fad40935ccbe4991c7 100755 (executable)
--- a/branch/multisys/exec/update
+++ b/branch/multisys/exec/update
@@ -8,8 +8,9 @@
 umask 002
 root=$1
 shift
-mkdir -p /var/cache/cran2deb/results || exit 1
-mini-dinstall --batch -c /etc/cran2deb/mini-dinstall.conf || exit 1
+sys=`{cran2deb which_sys}
+mkdir -p /var/cache/cran2deb/results/$sys || exit 1
+mini-dinstall --batch -c /etc/cran2deb/sys/$sys/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}
@@ -20,7 +21,6 @@ if (~ $1 full || ![ -e /var/cache/cran2deb/cache.rda ] ) {
 }
 if (![ -e /var/cache/cran2deb/cache.rda ] || [ $delta -gt $update_period ]) {
     mode=create
-    sys=`{cran2deb which_sys}
     if ([ -e /var/cache/pbuilder/base-cran2deb-$sys.tgz ]) {
         mode=update
     }