From cb24b66cf87c144e0397b1c097928ed4d4b5aa91 Mon Sep 17 00:00:00 2001 From: Eliot Miranda Date: Thu, 24 Feb 2022 10:37:46 -0800 Subject: [PATCH] Process 3DICC plugins as well as Qwaq in revertIfEssentiallyUnchanged --- scripts/revertIfEssentiallyUnchanged | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/revertIfEssentiallyUnchanged b/scripts/revertIfEssentiallyUnchanged index aa4e81d165..784dfbc92c 100755 --- a/scripts/revertIfEssentiallyUnchanged +++ b/scripts/revertIfEssentiallyUnchanged @@ -15,14 +15,14 @@ for f in "$@"; do *M*) ;; *) continue esac - RESULT="`git diff -- "$f" | grep '^[+-]' | egrep -v ' VMMaker[-.][a-z][a-z-]*\.[0-9][0-9]* uuid:| Cog[-.][a-z][a-z]*\.[0-9][0-9]* uuid:| Qwaq-Plugins[-.][a-z][a-z]*\.[0-9][0-9]* uuid:| VMMaker[-.][a-z][a-z-]*\.[0-9][0-9]*[ "]|static const char \*moduleName.*" INT_EXT;| Cog[-.][a-z][a-z-]*\.[0-9][0-9]* | Qwaq-Plugins[-.][a-z][a-z]*\.[0-9][0-9]* | VMConstruction-Plugins-OSProcessPlugin[a-z.-][a-z.-]*\.[0-9][0-9]* | Sound[-.][a-z][a-z]*\.[0-9][0-9]* uuid:|^[+-]const char \*interpreterVersion = |^\-\-\-|^\+\+\+|^[+-]$'`" + RESULT="`git diff -- "$f" | grep '^[+-]' | egrep -v ' VMMaker[-.][a-z][a-z-]*\.[0-9][0-9]* uuid:| Cog[-.][a-z][a-z]*\.[0-9][0-9]* uuid:| 3DICC-Plugins[-.][a-z][a-z]*\.[0-9][0-9]* uuid:| VMMaker[-.][a-z][a-z-]*\.[0-9][0-9]*[ "]|static const char \*moduleName.*" INT_EXT;| Cog[-.][a-z][a-z-]*\.[0-9][0-9]* | Qwaq-Plugins[-.][a-z][a-z]*\.[0-9][0-9]* | VMConstruction-Plugins-OSProcessPlugin[a-z.-][a-z.-]*\.[0-9][0-9]* | Sound[-.][a-z][a-z]*\.[0-9][0-9]* uuid:|^[+-]const char \*interpreterVersion = |^\-\-\-|^\+\+\+|^[+-]$'`" if [ -z "$TEST" ]; then test -z "$RESULT" && (echo reverting "$f"; git checkout -- "$f") elif [ "$TEST" = "-T" ]; then test -z "$RESULT" && echo $f essentially unchanged || echo $f changed else echo "testing; no output implies this would be reverted" - git diff -- "$f" | grep '^[+-]' | egrep -v ' VMMaker[-.][a-z][a-z-]*\.[0-9][0-9]* uuid:| Cog[-.][a-z][a-z]*\.[0-9][0-9]* uuid:| Qwaq-Plugins[-.][a-z][a-z]*\.[0-9][0-9]* uuid:| VMMaker[-.][a-z][a-z-]*\.[0-9][0-9]*[ "]|static const char \*moduleName.*" INT_EXT;| Cog[-.][a-z][a-z-]*\.[0-9][0-9]* | Qwaq-Plugins[-.][a-z][a-z]*\.[0-9][0-9]* | VMConstruction-Plugins-OSProcessPlugin[a-z.-][a-z.-]*\.[0-9][0-9]* | Sound[-.][a-z][a-z]*\.[0-9][0-9]* uuid:|^[+-]const char \*interpreterVersion =|^\-\-\-|^\+\+\+|^[+-]$' + git diff -- "$f" | grep '^[+-]' | egrep -v ' VMMaker[-.][a-z][a-z-]*\.[0-9][0-9]* uuid:| Cog[-.][a-z][a-z]*\.[0-9][0-9]* uuid:| 3DICC-Plugins[-.][a-z][a-z]*\.[0-9][0-9]* uuid:| VMMaker[-.][a-z][a-z-]*\.[0-9][0-9]*[ "]|static const char \*moduleName.*" INT_EXT;| Cog[-.][a-z][a-z-]*\.[0-9][0-9]* | Qwaq-Plugins[-.][a-z][a-z]*\.[0-9][0-9]* | VMConstruction-Plugins-OSProcessPlugin[a-z.-][a-z.-]*\.[0-9][0-9]* | Sound[-.][a-z][a-z]*\.[0-9][0-9]* uuid:|^[+-]const char \*interpreterVersion =|^\-\-\-|^\+\+\+|^[+-]$' fi fi done