match-all.action no longer overwritten during installation if already present
authorIan Silvester <iansilvester@fastmail.fm>
Sun, 1 Apr 2012 21:02:16 +0000 (21:02 +0000)
committerIan Silvester <iansilvester@fastmail.fm>
Sun, 1 Apr 2012 21:02:16 +0000 (21:02 +0000)
pkg resources/single-binary scripts/postinstall

index f228b50..59c21a0 100755 (executable)
@@ -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;