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

[OSXPackageBuilder.git] / pkg resources / single-binary scripts / postinstall

diff --git a/pkg resources/single-binary scripts/postinstall b/pkg resources/single-binary scripts/postinstall
index 91e2cdd..59c21a0 100755 (executable)
--- a/pkg resources/single-binary scripts/postinstall
+++ b/pkg resources/single-binary scripts/postinstall
@@ -38,8 +38,7 @@
 #  3. Detects the version of OS X on which we're installing
 #  4. Creates the logfile if not found and sets its ownership and persmissions
 #  5. Disables the startup method not necessary for the host's OS X version and start Privoxy
-#  6. Writes the package name into the uninstall script
-#  7. Opens the readme.rtf file for the user to read
+#  6. Opens the readme.rtf file for the user to read
 
 # preinstall created this file; continue to append to it in this script
 logfile='/var/privoxy_installation.log'
@@ -47,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;
@@ -104,8 +103,8 @@ echo 'Creating Privoxy logfile and setting owner and permissions' >> ${logfile}
 # 5. Disable the startup method not necessary for the host's OS X version and start Privoxy
 #
 case "${darwin_major_rel_num}" in
-  # Mac OS X 10.7, 10.6, 10.5
-  11|10|9)
+  # Mac OS X 10.5 or higher
+  9|1*)
                # delete Privoxy StartupItem
                echo 'Delete the Privoxy StartupItem since it is not required for this OS X version' >> ${logfile}
                if [ -d /Library/StartupItems/Disabled/Privoxy ]; then
@@ -130,11 +129,7 @@ case "${darwin_major_rel_num}" in
     ;;
 esac
 
-# 6. Write the package name into the uninstall script
-#
-#TODO
-
-# 7. Open the readme.rtf file for the user to read
+# 6. Open the readme.rtf file for the user to read
 /usr/bin/su $USER -c "/usr/bin/open /Applications/Privoxy/readme.rtfd"
 
 /bin/mv ${logfile} /Applications/Privoxy/install.log