From ea824d135bad68ac0d4b1f24db7be4596819c24e Mon Sep 17 00:00:00 2001 From: Ian Silvester Date: Thu, 3 Jan 2013 21:09:28 +0000 Subject: [PATCH] Removed version numbering from installer package internal identifier --- OS X 10.5+ PCRE.pmdoc/01pkg.xml | 2 +- OS X 10.5+ PCRE.pmdoc/index.xml | 2 +- OS X Package Builder HOWTO.txt | 9 ++------- Packagemaker Instructions.txt | 4 ++-- constructPkgContent.sh | 7 ------- .../Applications/Privoxy/uninstall.command | 4 ++-- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/OS X 10.5+ PCRE.pmdoc/01pkg.xml b/OS X 10.5+ PCRE.pmdoc/01pkg.xml index e595c3b..798609d 100644 --- a/OS X 10.5+ PCRE.pmdoc/01pkg.xml +++ b/OS X 10.5+ PCRE.pmdoc/01pkg.xml @@ -1 +1 @@ -org.ijbswa.privoxy3.0.19.pkg1.0pkg content/discardResourceForksinstallFrom.isRelativeTypescripts.scriptsDirectoryPath.pathidentifierparent/Users/yan/code/Privoxy/OSXPackageBuilder/pkg resources/single-binary scripts01pkg-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +org.ijbswa.privoxy.pkg3.0.20pkg content/discardResourceForksinstallFrom.isRelativeTypescripts.scriptsDirectoryPath.pathidentifierparentversion/Users/yan/code/Privoxy/OSXPackageBuilder/pkg resources/single-binary scripts01pkg-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file diff --git a/OS X 10.5+ PCRE.pmdoc/index.xml b/OS X 10.5+ PCRE.pmdoc/index.xml index 3188104..b20b4da 100644 --- a/OS X 10.5+ PCRE.pmdoc/index.xml +++ b/OS X 10.5+ PCRE.pmdoc/index.xml @@ -1 +1 @@ -Privoxy 3.0.19/Users/yan/code/Privoxy/Privoxy 3.0.19 PCRE.pkgorg.ijbswa.privoxy../current/LICENSEpkg resources/interface texts/ReadMe.txtpkg resources/interface texts/Introduction.txtpkg resources/interface texts/Finish Up.txtFailureOS X 10.5 or higher required.01pkg.xmlextraFilesproperties.titleproperties.customizeOptionproperties.anywhereDomainproperties.systemDomain \ No newline at end of file +Privoxy/Users/yan/code/Privoxy/builds/Privoxy 3.0.20 PCRE.pkgorg.ijbswa.privoxy../current/LICENSEpkg resources/interface texts/ReadMe.txtpkg resources/interface texts/Introduction.txtpkg resources/interface texts/Finish Up.txtFailureOS X 10.5 or higher required.01pkg.xmlextraFilesproperties.titleproperties.customizeOptionproperties.anywhereDomainproperties.systemDomain \ No newline at end of file diff --git a/OS X Package Builder HOWTO.txt b/OS X Package Builder HOWTO.txt index 1179bd2..ace0b82 100644 --- a/OS X Package Builder HOWTO.txt +++ b/OS X Package Builder HOWTO.txt @@ -64,13 +64,8 @@ Three different Packagemaker project files are supplied, though the procedure is - OS X 10.5+.pmdoc - if you are using the bundled PCRE library. - OS X 10.4.pmdoc - for Tiger builds with the bundled PCRE library. -Refer to the separate document "Packagemaker Instructions.txt" for complete instructions, however the following covers the list of mandatory changes to make per release: +Refer to the separate document "Packagemaker Instructions.txt" for complete instructions, however the following item is all that needs to be changed if you are building a package for a newer version of Privoxy: -'Distribution left-menu item>Configuration>Title' -'pkg content left-menu item>pkg content>Configuration>Package Identifier' - -Navigate to 'pkg content left-menu item>pkg content>Scripts' - -and drag and drop the directory 'pkg resources/single-binary scripts' from your file browser (e.g. Finder) into the 'Scripts directory' entry box. This MUST be left as an 'absolute' path due to a bug in PackageMaker; if you select 'relative to project' then the scripts will not be found nor added to the package at build time. +'pkg content left-menu item>pkg content>Configuration>Package Version' Finally click the 'Build' button at screen top-left. The package filename is up to you but I recommend "Privoxy .pkg", e.g. "Privoxy 3.0.19.pkg". For the down-level release I have used "Privoxy OS X 10.4.mpkg" \ No newline at end of file diff --git a/Packagemaker Instructions.txt b/Packagemaker Instructions.txt index 44bf698..11056c4 100644 --- a/Packagemaker Instructions.txt +++ b/Packagemaker Instructions.txt @@ -52,8 +52,8 @@ Package: pkg content Configuration Destination is / No custom location -The Package Identifier _MUST_ be in the form: 'org.ijbswa.privoxyX.Y.ZZ.pkg' where X.Y.ZZ is the release version (e.g. 3.0.19). This is important since the uninstall.command script is populated with this name by a separate process. -Package Version is irrelevant. +The Package Identifier _MUST_ be: 'org.ijbswa.privoxy.pkg'. This is important since the uninstall.command script references this identifier. +Package Version should match the version of Privoxy being built. Restart Action: None Require admin authentication should be ticked. Open the Package Flags window (Package>Package Flags...) and tick Discard Resource Forks. diff --git a/constructPkgContent.sh b/constructPkgContent.sh index fb5576a..b7da5fd 100755 --- a/constructPkgContent.sh +++ b/constructPkgContent.sh @@ -46,13 +46,6 @@ echo "Copy the package skeleton (the unchanging content) to a new folder named ' echo "" cp -vR pkg\ content\ skeleton pkg\ content -# Replace the version number placeholders in the uninstallation script -echo "" -echo "Replace the version number placeholders in the uninstallation script" -echo "" -VERSION=`perl findversion.pl ../${SOURCE_DIR}/ChangeLog` -sed "s/PRIVOXY_VERSION/${VERSION}/g" pkg\ content\ skeleton/Applications/Privoxy/uninstall.command > pkg\ content/Applications/Privoxy/uninstall.command - # Copy the compiled privoxy binary from the '${SOURCE_DIR}' directory echo "" echo "" diff --git a/pkg content skeleton/Applications/Privoxy/uninstall.command b/pkg content skeleton/Applications/Privoxy/uninstall.command index 76054ac..a237fe1 100755 --- a/pkg content skeleton/Applications/Privoxy/uninstall.command +++ b/pkg content skeleton/Applications/Privoxy/uninstall.command @@ -72,9 +72,9 @@ if [ "$UID" -eq "$root_UID" ]; then echo 'Delete package installation receipt (ignore errors relating to other bundle identifiers).' # On OS X 10.5 or newer we can use the new pkgutil command else simply delete the receipt file if [ -x /usr/sbin/pkgutil ]; then - pkgutil --forget org.ijbswa.privoxyPRIVOXY_VERSION.pkg + pkgutil --forget org.ijbswa.privoxy.pkg else - rm -rf /Library/Receipts/Privoxy\ PRIVOXY_VERSION\ OS\ X\ 10.4.pkg + rm -rf /Library/Receipts/Privoxy\ OS\ X\ 10.4.pkg fi # Check the Trash, just in case the user manually removed the only obvious item from /Applications -- 2.39.2