Fix .Sanitize scrips so that r16 is truly scrubbed out.

Also, report errors if any traces of sanitize remain after sanitizing.

1 files changed, 29 insertions, 0 deletions

diff --git a/.Sanitize b/.Sanitize
index 26787c6..402d926 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -207,6 +207,35 @@ else
 	done
 fi
 
+r16_files = "config.sub"
+
+if ( echo $* | grep keep\-r16 > /dev/null ) ; then
+	for i in r16_files ; do
+		if test ! -d $i && (grep sanitize-r16 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping r16 stuff in $i
+			fi
+		fi
+	done
+else
+	for i in r16_files ; do
+		if test ! -d $i && (grep sanitize-r16 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"r16\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-r16/,/end-\sanitize\-r16/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
 for i in * ; do
 	if test ! -d $i && (grep sanitize $i > /dev/null) ; then
 		echo '***' Some mentions of Sanitize are still left in $i! 1>&2