corrections following testing on OS X 10.8

diff --git a/README b/README
index 774447e..706db75 100644 (file)
--- a/README
+++ b/README
@@ -40,6 +40,7 @@ SUPPORTED PLATFORMS
 
 Theoretically this framework can create installer packages for OS X from versions 10.3 to 10.8 (and higher) inclusive, and for all three processor architectures on which OS X is supported (PowerPC, Intel x86 and Intel x86_64). Packages have so far been tested on the following platforms:
 
+10.8 x86_64
 10.7 x86_64
 10.6 x86_64 & x86
 10.5 x86_64, x86 & PPC
@@ -48,7 +49,7 @@ Theoretically this framework can create installer packages for OS X from version
 
 ATTRIBUTION
 
-This module is based on the previous work done by Mark Miller (macsetup module) and David Schmidt & John Daniels (osxsetup module), to whom I am indebted. Thanks also to Fabian Keil for occasional technical and significant licensing guidance, and to Andrew Jones, Andreas Rutkauskas, Julien Joubert and Lizik Grelier for testing.
+This module is based on the previous work done by Mark Miller (macsetup module) and David Schmidt & John Daniels (osxsetup module), to whom I am indebted. Thanks also to Fabian Keil for occasional technical and significant licensing guidance, and to Andrew Jones, Andreas Rutkauskas, Julien Joubert, Lizik Grelier and Steven Kolins for testing.
 
 
 Ian Silvester February 2012
\ No newline at end of file

diff --git a/common.sh b/common.sh
index 320ac17..0131199 100755 (executable)
--- a/common.sh
+++ b/common.sh
@@ -124,8 +124,8 @@ darwin_major_rel_num="`/usr/bin/uname -r | /usr/bin/sed 's/\..*//'`"
 # check the release number
 #
 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*)
     GNAME="`/usr/bin/dscl /Local/Default -list /groups | /usr/bin/grep -E '^(_)?privoxy?'`"
     UNAME="`/usr/bin/dscl /Local/Default -list /users | /usr/bin/grep -E '^(_)?privoxy?'`"
     SCRIPT="privoxy-create-dscl.sh"

diff --git a/pkg content skeleton/Applications/Privoxy/readme.rtfd/TXT.rtf b/pkg content skeleton/Applications/Privoxy/readme.rtfd/TXT.rtf
index 5a12cd0..bfc4423 100644 (file)
--- a/pkg content skeleton/Applications/Privoxy/readme.rtfd/TXT.rtf
+++ b/pkg content skeleton/Applications/Privoxy/readme.rtfd/TXT.rtf
@@ -99,7 +99,7 @@ You will be prompted for your password, since the script requires super-user pri
 \b Thanks\
 
 \b0 \
-This installer is based on previous work done by Mark Miller, David Schmidt and John Daniels, to whom I am indebted. Thanks also to Fabian Keil for occasional technical and significant licensing guidance, and to Andrew Jones, Andreas Rutkauskas, Julien Joubert and Lizik Grelier for testing.\
+This installer is based on previous work done by Mark Miller, David Schmidt and John Daniels, to whom I am indebted. Thanks also to Fabian Keil for occasional technical and significant licensing guidance, and to Andrew Jones, Andreas Rutkauskas, Julien Joubert, Lizik Grelier and Steven Kolins for testing.\
 \
 \
 \

diff --git a/pkg content skeleton/Applications/Privoxy/startPrivoxy.sh b/pkg content skeleton/Applications/Privoxy/startPrivoxy.sh
index 761aa2e..5ce2477 100755 (executable)
--- a/pkg content skeleton/Applications/Privoxy/startPrivoxy.sh
+++ b/pkg content skeleton/Applications/Privoxy/startPrivoxy.sh
@@ -37,8 +37,8 @@ if [ "$UID" -eq "$root_UID" ]; then
        # what is the kernel version
        darwin_major_rel_num="`/usr/bin/uname -r | /usr/bin/sed 's/\..*//'`"
        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*)
                        /bin/launchctl load /Library/LaunchDaemons/org.ijbswa.privoxy.plist
                ;;
                # Mac OS X 10.4, 10.3

diff --git a/pkg content skeleton/Applications/Privoxy/stopPrivoxy.sh b/pkg content skeleton/Applications/Privoxy/stopPrivoxy.sh
index a8052f0..f878f22 100755 (executable)
--- a/pkg content skeleton/Applications/Privoxy/stopPrivoxy.sh
+++ b/pkg content skeleton/Applications/Privoxy/stopPrivoxy.sh
@@ -38,8 +38,8 @@ if [ "$UID" -eq "$root_UID" ]; then
        # what is the kernel version
        darwin_major_rel_num="`/usr/bin/uname -r | /usr/bin/sed 's/\..*//'`"
        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*)
                        /bin/launchctl unload /Library/LaunchDaemons/org.ijbswa.privoxy.plist
                ;;
                # Mac OS X 10.4, 10.3

diff --git a/pkg content skeleton/Applications/Privoxy/uninstall.command b/pkg content skeleton/Applications/Privoxy/uninstall.command
index 1112c00..567f0a3 100755 (executable)
--- a/pkg content skeleton/Applications/Privoxy/uninstall.command
+++ b/pkg content skeleton/Applications/Privoxy/uninstall.command
@@ -89,8 +89,8 @@ if [ "$UID" -eq "$root_UID" ]; then
                        darwin_major_rel_num="`/usr/bin/uname -r | /usr/bin/sed 's/\..*//'`"
 
                        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 LaunchDaemon
                                        echo 'Delete Privoxy LaunchDaemon (an error will be thrown regarding "no such process")'
                                        /bin/launchctl unload /Library/LaunchDaemons/org.ijbswa.privoxy.plist

diff --git a/pkg resources/single-binary scripts/postinstall b/pkg resources/single-binary scripts/postinstall
index 91e2cdd..215a189 100755 (executable)
--- a/pkg resources/single-binary scripts/postinstall
+++ b/pkg resources/single-binary scripts/postinstall
@@ -104,8 +104,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

diff --git a/pkg resources/single-binary scripts/postupgrade b/pkg resources/single-binary scripts/postupgrade
index 91e2cdd..215a189 100755 (executable)
--- a/pkg resources/single-binary scripts/postupgrade
+++ b/pkg resources/single-binary scripts/postupgrade
@@ -104,8 +104,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

diff --git a/pkg resources/single-binary scripts/preinstall b/pkg resources/single-binary scripts/preinstall
index 953a45c..0e3926f 100755 (executable)
--- a/pkg resources/single-binary scripts/preinstall
+++ b/pkg resources/single-binary scripts/preinstall
@@ -91,8 +91,8 @@ echo 'Darwin major release version is:' ${darwin_major_rel_num} >> ${logfile}
 # 3. Create the privoxy group and user (using the host-specific command to do so)
 #
 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*)
     GNAME="`/usr/bin/dscl /Local/Default -list /groups | /usr/bin/grep -E '^(_)?privoxy?'`"
     UNAME="`/usr/bin/dscl /Local/Default -list /users | /usr/bin/grep -E '^(_)?privoxy?'`"
        # create group if it does not exist

diff --git a/pkg resources/single-binary scripts/preupgrade b/pkg resources/single-binary scripts/preupgrade
index 953a45c..0e3926f 100755 (executable)
--- a/pkg resources/single-binary scripts/preupgrade
+++ b/pkg resources/single-binary scripts/preupgrade
@@ -91,8 +91,8 @@ echo 'Darwin major release version is:' ${darwin_major_rel_num} >> ${logfile}
 # 3. Create the privoxy group and user (using the host-specific command to do so)
 #
 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*)
     GNAME="`/usr/bin/dscl /Local/Default -list /groups | /usr/bin/grep -E '^(_)?privoxy?'`"
     UNAME="`/usr/bin/dscl /Local/Default -list /users | /usr/bin/grep -E '^(_)?privoxy?'`"
        # create group if it does not exist