From: Ian Silvester <iansilvester@fastmail.fm>
Date: Sun, 1 Apr 2012 21:31:40 +0000 (+0000)
Subject: match-all.action no longer overwritten during installation if already present
X-Git-Url: http://www.privoxy.org/gitweb/developer-manual/static/faq/@default-cgi@?a=commitdiff_plain;h=fdd1c1406097e01366a29980b67d677b9920173b;p=OSXPackageBuilder.git

match-all.action no longer overwritten during installation if already present
---

diff --git a/pkg resources/single-binary scripts/postupgrade b/pkg resources/single-binary scripts/postupgrade
index f228b50..59c21a0 100755
--- a/pkg resources/single-binary scripts/postupgrade	
+++ b/pkg resources/single-binary scripts/postupgrade	
@@ -46,8 +46,8 @@ logfile='/var/privoxy_installation.log'
 #  1. Move config files into place, setting ownership and permissions, respecting any existing user config
 #
 for i in default.action default.filter match-all.action config trust user.action user.filter templates; do
-	if [ "$i" = "default.action" ] || [ "$i" = "default.filter" ] || [ "$i" = "match-all.action" ] ; then
-		# for the files a Mac user is very unlikely to have changed, overwrite existing, older versions
+	if [ "$i" = "default.action" ] || [ "$i" = "default.filter" ] ; then
+		# for the files that the end user should not edit, overwrite existing, older versions
 		echo 'Installing config file (overwriting existing file if present):' $i >> ${logfile}
 		/bin/rm -f /usr/local/etc/privoxy/$i
 		/usr/bin/install -c -m 0664 -o privoxy -g privoxy /usr/local/etc/privoxy/vanilla/$i /usr/local/etc/privoxy || exit 1;