From: Alexander Barton <alex@barton.de>
Date: Fri, 29 Aug 2014 23:56:26 +0000 (+0200)
Subject: Remove OS X packaging scripts
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=nagcollect.git;a=commitdiff_plain;h=HEAD;hp=10329e9eaf11d1c359716bcdee705e265cbfc979

Remove OS X packaging scripts
---

diff --git a/Makefile b/Makefile
index 5c783c9..ba8a06e 100644
--- a/Makefile
+++ b/Makefile
@@ -99,19 +99,6 @@ plugins:
 	 done \
 	)
 
-osxpkg:
-	rel=`grep "^NagCollect " ChangeLog|awk "{print \\\$$3 }"|head -n 1`; \
-	 rm -rf "../NagCollect-R$${rel}.mpkg" \
-	 && packagemaker \
-	     --doc "contrib/NagCollect.pmdoc" \
-	     --out "../NagCollect-R$${rel}.mpkg"
-
-osxdmg: osxpkg
-	rel=`grep "^NagCollect " ChangeLog|awk "{print \\\$$3 }"|head -n 1`; \
-	 rm -f "../NagCollect-R$${rel}.dmg" \
-	 && hdiutil create -srcfolder \
-	     "../NagCollect-R$${rel}.mpkg" "../NagCollect-R$${rel}.dmg"
-
 nagcollecttestscripts:
 	COPYFILE_DISABLE=true tar -czvf nagcollecttestscripts.tgz \
 	 -C client/lib/tests .
diff --git a/contrib/NagCollect.pmdoc/01nagcollect-contents.xml b/contrib/NagCollect.pmdoc/01nagcollect-contents.xml
deleted file mode 100644
index 00e732c..0000000
--- a/contrib/NagCollect.pmdoc/01nagcollect-contents.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pkg-contents spec="1.12"><f n="nagcollect" o="root" g="wheel" p="33261" pt="/Users/alex/Develop/nagcollect/client/bin/nagcollect" m="false" t="file"><mod>group</mod><mod>owner</mod></f></pkg-contents>
\ No newline at end of file
diff --git a/contrib/NagCollect.pmdoc/01nagcollect.xml b/contrib/NagCollect.pmdoc/01nagcollect.xml
deleted file mode 100644
index 0723946..0000000
--- a/contrib/NagCollect.pmdoc/01nagcollect.xml
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 660121d..0000000
--- a/contrib/NagCollect.pmdoc/02nagcollect-contents.xml
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index aa9dea3..0000000
--- a/contrib/NagCollect.pmdoc/02nagcollect.xml
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 7525711..0000000
--- a/contrib/NagCollect.pmdoc/03tests-contents.xml
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index e397d3b..0000000
--- a/contrib/NagCollect.pmdoc/03tests.xml
+++ /dev/null
@@ -1 +0,0 @@
-<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/04de-contents.xml b/contrib/NagCollect.pmdoc/04de-contents.xml
deleted file mode 100644
index ed94d14..0000000
--- a/contrib/NagCollect.pmdoc/04de-contents.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pkg-contents spec="1.12"><f n="de.barton.nagcollect" o="root" g="wheel" p="33188" pt="/Users/alex/Develop/nagcollect/client/lib/de.barton.nagcollect" m="false" t="file"><mod>group</mod><mod>owner</mod></f></pkg-contents>
\ No newline at end of file
diff --git a/contrib/NagCollect.pmdoc/04de.xml b/contrib/NagCollect.pmdoc/04de.xml
deleted file mode 100644
index 4b3f53a..0000000
--- a/contrib/NagCollect.pmdoc/04de.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="93FCFF65-282E-4131-B4AC-6FC1345FF6F8"><config><identifier>de.barton.nagcollectClient.launchscript.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true">../client/lib/de.barton.nagcollect.plist</installFrom><installTo mod="true">/Library/LaunchDaemons</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>scripts.preinstall.path</mod><mod>scripts.postflight.path</mod><mod>installTo</mod><mod>scripts.postinstall.path</mod><mod>scripts.preflight.isRelativeType</mod><mod>installFrom.isRelativeType</mod><mod>scripts.postflight.isRelativeType</mod><mod>version</mod><mod>parent</mod><mod>scripts.preupgrade.path</mod><mod>identifier</mod><mod>scripts.postupgrade.path</mod><mod>requireAuthorization</mod><mod>scripts.preflight.path</mod><mod>extraFiles</mod><mod>installTo.path</mod></config><scripts><preinstall relative="true" mod="true">setup-osx.sh</preinstall><postinstall relative="true" mod="true">launch-osx.sh</postinstall><preupgrade relative="true" mod="true">setup-osx.sh</preupgrade><postupgrade relative="true" mod="true">launch-osx.sh</postupgrade></scripts><contents><file-list>04de-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra-files/></pkgref>
diff --git a/contrib/NagCollect.pmdoc/index.xml b/contrib/NagCollect.pmdoc/index.xml
deleted file mode 100644
index 5ea8dde..0000000
--- a/contrib/NagCollect.pmdoc/index.xml
+++ /dev/null
@@ -1 +0,0 @@
-<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
diff --git a/contrib/fix-usr-local.sh b/contrib/fix-usr-local.sh
deleted file mode 100755
index eaf6aec..0000000
--- a/contrib/fix-usr-local.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# NagCollect -- Nagios Data Collector for Passive Checks
-# Copyright (c)2009-2010 Alexander Barton, alex@barton.de
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# Please read the file COPYING, README and AUTHORS for more information.
-#
-
-logger -t "fix-usr-local.sh" -s "starting ..."
-
-chown root:wheel /usr/local /usr/local/etc /usr/local/sbin
-chmod 755 /usr/local /usr/local/etc /usr/local/sbin
-
-chown root:wheel /usr/local/etc/nagcollect.conf
-chmod 640 /usr/local/etc/nagcollect.conf
-
-chown root:wheel /usr/local/sbin/nagcollect
-chmod 755 /usr/local/sbin/nagcollect
-
-chown -R root:wheel /usr/local/lib/nagcollect
-chmod -R a+rX /usr/local/lib/nagcollect
-
-logger -t "fix-usr-local.sh" -s "done."
diff --git a/contrib/launch-osx.sh b/contrib/launch-osx.sh
deleted file mode 100755
index 75f0802..0000000
--- a/contrib/launch-osx.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# NagCollect -- Nagios Data Collector for Passive Checks
-# Copyright (c)2009,2011 Alexander Barton, alex@barton.de
-#
-logger -t "launch-osx.sh" -s "starting ..."
-[ -r /usr/local/etc/nagcollect.conf ] && . /usr/local/etc/nagcollect.conf
-if [ -n "$SERVER_URL" -a -n "$CLIENT_KEY" -a -n "$CLIENT_ID" ]; then
-	logger -t "launch-osx.sh" -s "Configuration valid, loading LaunchDaemon script ..."
-	chown root:wheel /Library/LaunchDaemons/de.barton.nagcollect.plist
-	chmod 644 /Library/LaunchDaemons/de.barton.nagcollect.plist
-	launchctl load -w /Library/LaunchDaemons/de.barton.nagcollect.plist
-else
-	logger -t "launch-osx.sh" -s "Configuration not valid, NOT LOADING LaunchDaemon script!"
-fi
-logger -t "launch-osx.sh" -s "done."
diff --git a/contrib/setup-osx.sh b/contrib/setup-osx.sh
deleted file mode 100755
index 9e8bcc6..0000000
--- a/contrib/setup-osx.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# NagCollect -- Nagios Data Collector for Passive Checks
-# Copyright (c)2009,2011 Alexander Barton, alex@barton.de
-#
-logger -t "setup-osx.sh" -s "starting ..."
-[ -r /Library/LaunchDaemons/de.barton.nagcollect ] \
-	&& launchctl unload -w /Library/LaunchDaemons/de.barton.nagcollect
-rm -f /Library/LaunchDaemons/de.barton.nagcollect
-[ -r /Library/LaunchDaemons/de.barton.nagcollect.plist ] \
-	&& launchctl unload -w /Library/LaunchDaemons/de.barton.nagcollect.plist
-rm -f /Library/LaunchDaemons/de.barton.nagcollect.plist
-logger -t "setup-osx.sh" -s "done."