Mac OS X package: fix permissions of files installed in /usr/local

Run the contrib/fix-usr-local.sh script after installing nagcollect,
nagcollect.conf and the test scripts to fix file and folder permissions.

diff --git a/contrib/NagCollect.pmdoc/01nagcollect.xml b/contrib/NagCollect.pmdoc/01nagcollect.xml
index d5cbb050d1c8ffe9d0e1d441af24100ed7b4c8cd..0723946e313a6da796bb9940a92c1c2292afc074 100644 (file)
--- a/contrib/NagCollect.pmdoc/01nagcollect.xml
+++ b/contrib/NagCollect.pmdoc/01nagcollect.xml
@@ -1 +1 @@
-<pkgref spec="1.12" uuid="52BF7228-3822-4088-A5D5-50E1E74CE63E"><config><identifier>de.barton.nagcollectClient.nagcollect.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true">../client/bin/nagcollect</installFrom><installTo mod="true">/usr/local/sbin</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installFrom.isRelativeType</mod><mod>installTo</mod><mod>identifier</mod><mod>parent</mod><mod>version</mod><mod>installTo.path</mod><mod>requireAuthorization</mod><mod>extraFiles</mod></config><contents><file-list>01nagcollect-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra-files/></pkgref>
\ No newline at end of file
+<pkgref spec="1.12" uuid="52BF7228-3822-4088-A5D5-50E1E74CE63E"><config><identifier>de.barton.nagcollectClient.nagcollect.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true">../client/bin/nagcollect</installFrom><installTo mod="true">/usr/local/sbin</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>extraFiles</mod><mod>installTo</mod><mod>scripts.postinstall.path</mod><mod>scripts.postupgrade.path</mod><mod>identifier</mod><mod>parent</mod><mod>version</mod><mod>installTo.path</mod><mod>installFrom.isRelativeType</mod><mod>requireAuthorization</mod></config><scripts><postinstall relative="true" mod="true">fix-usr-local.sh</postinstall><postupgrade relative="true" mod="true">fix-usr-local.sh</postupgrade></scripts><contents><file-list>01nagcollect-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra-files/></pkgref>
\ No newline at end of file

diff --git a/contrib/NagCollect.pmdoc/02nagcollect-contents.xml b/contrib/NagCollect.pmdoc/02nagcollect-contents.xml
index 6434fd09b15e977b0ba58ba1e0ce4da56d69783d..660121d841dc11b92271a9a35b00ab8e7f199318 100644 (file)
--- a/contrib/NagCollect.pmdoc/02nagcollect-contents.xml
+++ b/contrib/NagCollect.pmdoc/02nagcollect-contents.xml
@@ -1 +1 @@
-<pkg-contents spec="1.12"><f n="nagcollect.conf" o="root" g="wheel" p="33188" pt="/Users/alex/Develop/nagcollect/client/etc/nagcollect.conf" m="false" t="file"><mod>group</mod><mod>owner</mod></f></pkg-contents>
\ No newline at end of file
+<pkg-contents spec="1.12"><f n="nagcollect.conf" o="root" g="wheel" p="33184" pt="/Users/alex/Develop/nagcollect/client/etc/nagcollect.conf" m="true" t="file"><mod>mode</mod><mod>group</mod><mod>owner</mod></f></pkg-contents>
\ No newline at end of file

diff --git a/contrib/NagCollect.pmdoc/02nagcollect.xml b/contrib/NagCollect.pmdoc/02nagcollect.xml
index 2a311500d3df1b2837f9a91c25ded8f93accd995..aa9dea392c672ac777b4e86c2bf40063c5e4d5a0 100644 (file)
--- a/contrib/NagCollect.pmdoc/02nagcollect.xml
+++ b/contrib/NagCollect.pmdoc/02nagcollect.xml
@@ -1 +1 @@
-<pkgref spec="1.12" uuid="565E7308-1208-4EDA-B9DF-55221C3C23AC"><config><identifier>de.barton.nagcollectClient.conf.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true">../client/etc/nagcollect.conf</installFrom><installTo mod="true">/usr/local/etc</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installFrom.isRelativeType</mod><mod>installTo</mod><mod>identifier</mod><mod>parent</mod><mod>version</mod><mod>installTo.path</mod><mod>requireAuthorization</mod><mod>extraFiles</mod></config><contents><file-list>02nagcollect-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra-files/></pkgref>
\ No newline at end of file
+<pkgref spec="1.12" uuid="565E7308-1208-4EDA-B9DF-55221C3C23AC"><config><identifier>de.barton.nagcollectClient.conf.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true">../client/etc/nagcollect.conf</installFrom><installTo mod="true">/usr/local/etc</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>extraFiles</mod><mod>installTo</mod><mod>scripts.postupgrade.isRelativeType</mod><mod>scripts.postinstall.path</mod><mod>identifier</mod><mod>parent</mod><mod>version</mod><mod>installTo.path</mod><mod>installFrom.isRelativeType</mod><mod>requireAuthorization</mod></config><scripts><postinstall relative="true" mod="true">fix-usr-local.sh</postinstall><postupgrade relative="true" mod="true">fix-usr-local.sh</postupgrade></scripts><contents><file-list>02nagcollect-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra-files/></pkgref>
\ No newline at end of file

diff --git a/contrib/NagCollect.pmdoc/03tests-contents.xml b/contrib/NagCollect.pmdoc/03tests-contents.xml
index f6522e20a96ffff99b2f36ea8658beea9edd6aed..75257116f1da98a840f0645e483738c1ec39dca4 100644 (file)
--- a/contrib/NagCollect.pmdoc/03tests-contents.xml
+++ b/contrib/NagCollect.pmdoc/03tests-contents.xml
@@ -1 +1 @@
-<pkg-contents spec="1.12"><f n="tests" o="root" g="wheel" p="16877" pt="/Users/alex/Develop/nagcollect/client/lib/tests" m="false" t="file"><f n="Disks.tst" o="root" g="wheel" p="33188"><mod>group</mod><mod>owner</mod></f><f n="RAID.tst" o="root" g="wheel" p="33188"><mod>group</mod><mod>owner</mod></f><f n="Sys-Load.tst" o="root" g="wheel" p="33188"><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f></pkg-contents>
\ No newline at end of file
+<pkg-contents spec="1.12"><f n="tests" o="root" g="wheel" p="16877" pt="/Users/alex/Develop/nagcollect/client/lib/tests" m="false" t="file"><f n="Darwin" o="root" g="wheel" p="16877"><f n="DiskErrors.tst" o="root" g="wheel" p="33188"><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f><f n="Disks.tst" o="root" g="wheel" p="33188"><mod>group</mod><mod>owner</mod></f><f n="RAID.tst" o="root" g="wheel" p="33188"><mod>group</mod><mod>owner</mod></f><f n="Sys-Load.tst" o="root" g="wheel" p="33188"><mod>group</mod><mod>owner</mod></f><f n="Uptime.tst" o="root" g="wheel" p="33188"><mod>group</mod><mod>owner</mod></f><mod>group</mod><mod>owner</mod></f></pkg-contents>
\ No newline at end of file

diff --git a/contrib/NagCollect.pmdoc/03tests.xml b/contrib/NagCollect.pmdoc/03tests.xml
index b48af3907dad4dd4c6857813d793a57c1e8db42d..e397d3b50ed02ba40b76f42acfe38291739b3467 100644 (file)
--- a/contrib/NagCollect.pmdoc/03tests.xml
+++ b/contrib/NagCollect.pmdoc/03tests.xml
@@ -1 +1 @@
-<pkgref spec="1.12" uuid="5E5B797D-D243-4A9B-BF6D-1BA29C6A2502"><config><identifier>de.barton.nagcollectClient.tests.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true">../client/lib/tests</installFrom><installTo mod="true">/usr/local/lib/nagcollect</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>extraFiles</mod><mod>installTo</mod><mod>installTo.path</mod><mod>requireAuthorization</mod><mod>parent</mod><mod>includeRoot</mod><mod>version</mod><mod>installFrom.isRelativeType</mod><mod>identifier</mod></config><contents><file-list>03tests-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra-files/></pkgref>
\ No newline at end of file
+<pkgref spec="1.12" uuid="5E5B797D-D243-4A9B-BF6D-1BA29C6A2502"><config><identifier>de.barton.nagcollectClient.tests.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">../client/lib/tests</installFrom><installTo mod="true">/usr/local/lib/nagcollect</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo</mod><mod>scripts.postinstall.path</mod><mod>installFrom.isRelativeType</mod><mod>includeRoot</mod><mod>version</mod><mod>parent</mod><mod>identifier</mod><mod>requireAuthorization</mod><mod>installFrom.path</mod><mod>scripts.postupgrade.path</mod><mod>extraFiles</mod><mod>installTo.path</mod></config><scripts><postinstall relative="true" mod="true">fix-usr-local.sh</postinstall><postupgrade relative="true" mod="true">fix-usr-local.sh</postupgrade></scripts><contents><file-list>03tests-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra-files/></pkgref>
\ No newline at end of file

diff --git a/contrib/NagCollect.pmdoc/index.xml b/contrib/NagCollect.pmdoc/index.xml
index 6db19d46929ac6cd8002ecf166e60ac54808c6fa..5ea8ddef2785ad8b964241e1c8060b6c6c428763 100644 (file)
--- a/contrib/NagCollect.pmdoc/index.xml
+++ b/contrib/NagCollect.pmdoc/index.xml
@@ -1 +1 @@
-<pkmkdoc spec="1.12"><properties><title>NagCollect Client</title><build>/Users/alex/Desktop/NagCollect Client.mpkg</build><organization>de.barton</organization><userSees ui="both"/><min-target os="2"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="NagCollect Scripts" id="choicenagcollect" starts_selected="true" starts_enabled="true" starts_hidden="false"><customLoc>/</customLoc><pkgref id="de.barton.nagcollectClient.nagcollect.pkg"/><pkgref id="de.barton.nagcollectClient.tests.pkg"/></choice><choice title="NagCollect Configuration" id="choiceconf" starts_selected="true" starts_enabled="true" starts_hidden="false"><customLoc>/</customLoc><pkgref id="de.barton.nagcollectClient.conf.pkg"/><choice-reqs><requirement id="filt" operator="eq" value="true" selected="yes" enabled="yes" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><file>/usr/local/etc/nagcollect.conf</file></requirement></choice-reqs></choice><choice title="NagCollect Service Script" id="choicelaunch" starts_selected="true" starts_enabled="true" starts_hidden="false"><customLoc>/</customLoc><pkgref id="de.barton.nagcollectClient.launchscript.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="de"/></resources><flags/><extra-files/><item type="file">01nagcollect.xml</item><item type="file">02nagcollect.xml</item><item type="file">03tests.xml</item><item type="file">04de.xml</item><mod>extraFiles</mod><mod>properties.title</mod><mod>properties.customizeOption</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc>
\ No newline at end of file
+<pkmkdoc spec="1.12"><properties><title>NagCollect Client</title><build>/Users/alex/Desktop/NagCollect Client.mpkg</build><organization>de.barton</organization><userSees ui="both"/><min-target os="2"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="NagCollect Scripts" id="choicenagcollect" starts_selected="true" starts_enabled="true" starts_hidden="false"><customLoc>/</customLoc><pkgref id="de.barton.nagcollectClient.nagcollect.pkg"/><pkgref id="de.barton.nagcollectClient.tests.pkg"/></choice><choice title="NagCollect Configuration" id="choiceconf" starts_selected="true" starts_enabled="true" starts_hidden="false"><customLoc>/</customLoc><pkgref id="de.barton.nagcollectClient.conf.pkg"/><choice-reqs><requirement id="filt" operator="eq" value="true" selected="yes" enabled="yes" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><file>/usr/local/etc/nagcollect.conf</file></requirement></choice-reqs></choice><choice title="NagCollect Service Script" id="choicelaunch" starts_selected="true" starts_enabled="true" starts_hidden="false"><customLoc>/</customLoc><pkgref id="de.barton.nagcollectClient.launchscript.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="de"/></resources><flags/><extra-files/><item type="file">01nagcollect.xml</item><item type="file">02nagcollect.xml</item><item type="file">03tests.xml</item><item type="file">04de.xml</item><mod>properties.systemDomain</mod><mod>properties.title</mod><mod>properties.customizeOption</mod><mod>properties.anywhereDomain</mod><mod>extraFiles</mod></pkmkdoc>
\ No newline at end of file