chiark
/
gitweb
/
~webstump
/
modbot-mtm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
webstump: use "reject blocklist" for the hardcoded blocklist-related rejection reason
[modbot-mtm.git]
/
install-substitutions
diff --git
a/install-substitutions
b/install-substitutions
index 8df87c0e4f558a7cde3926984ae6b04a810b40c3..9bcee54da8a0182e7f93432b6408f914ee912735 100755
(executable)
--- a/
install-substitutions
+++ b/
install-substitutions
@@
-1,6
+1,16
@@
#!/bin/bash
set -e
#!/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 '
. ./get-settings
find -name '*.IN[O1]' ! -path '*/skeleton/*' -exec perl -e '
@@
-17,7
+27,7
@@
find -name '*.IN[O1]' ! -path '*/skeleton/*' -exec perl -e '
my $mode= (stat F)[2];
while (<F>) {
s/\%(\w+)\%/
my $mode= (stat F)[2];
while (<F>) {
s/\%(\w+)\%/
- exists($ENV{$1}) ? $ENV{$1} : die "$1
?
"
+ exists($ENV{$1}) ? $ENV{$1} : die "$1
undef at $f:$.\n
"
/ge;
print G or die $!;
}
/ge;
print G or die $!;
}
@@
-27,7
+37,15
@@
find -name '*.IN[O1]' ! -path '*/skeleton/*' -exec perl -e '
chmod 0755, $g or die "$g $!";
}
close F or die $!;
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) {
rename $g, $d or die "$g $d $!";
} else {
if (link $g, $d) {