Merge branch 'master' of ../live-urcm

diff --git a/install-substitutions b/install-substitutions
index 4f09cd3c06ed52ea06180cba2c6f8f8cbb652d71..9bcee54da8a0182e7f93432b6408f914ee912735 100755 (executable)
--- a/install-substitutions
+++ b/install-substitutions
@@ -1,6 +1,16 @@
 #!/bin/bash
 set -e
 
+if [ "x$1" = "x-n" ]; then
+        diffonly=1; diffsparse=0; shift
+elif [ "x$1" = "x-nq" ]; then
+        diffonly=1; diffsparse=1; shift
+else
+        diffonly=0; diffsparse=-1
+fi
+
+if [ $# != 0 ]; then echo >&2 "usage: ./${0##*/} [-n]"; exit 1; fi
+
 . ./get-settings
 
 find -name '*.IN[O1]' ! -path '*/skeleton/*' -exec perl -e '
@@ -27,7 +37,15 @@ find -name '*.IN[O1]' ! -path '*/skeleton/*' -exec perl -e '
                chmod 0755, $g or die "$g $!";
        }
        close F or die $!;
-       if ($overwrite) {
+        if ('$diffonly') {
+                if (!-f $d) {
+                        print "Would create $d\n";
+                } elsif ('$diffsparse' && !$overwrite) {
+                        print "Not reporting on $d as would not overwrite.\n";
+                } else {
+                        system "diff -u $d $g";
+                }
+        } elsif ($overwrite) {
                rename $g, $d or die "$g $d $!";
        } else {
                if (link $g, $d) {

diff --git a/stump/etc/modenv.INO b/stump/etc/modenv.INO
index ed322f6c63930267fd499a89a6081d14f2a0f041..171547468c4e42352ae679b073b8c2f8cee6e431 100755 (executable)
--- a/stump/etc/modenv.INO
+++ b/stump/etc/modenv.INO
@@ -44,7 +44,7 @@ MAILOUT_RECVACK_FORMAIL_ARGS='
        -I Bcc:%OURUSER%+%ABBREV%-internal-log+mailout@%DOMAIN%
 '
 MAILOUT_ACCEPTACK_FORMAIL_ARGS='
-       -I Bcc:%OURUSER%+mtm-internal-log+mailout@%DOMAIN%
+       -I Bcc:%OURUSER%+%ABBREV%-internal-log+mailout@%DOMAIN%
 '
 MAILOUT_REJECT_FORMAIL_ARGS='
        -I Bcc:%OURUSER%+%ABBREV%-internal-log+mailout@%DOMAIN%