Remove OS X packaging scripts

[nagcollect.git] / client / bin / nagcollect

diff --git a/client/bin/nagcollect b/client/bin/nagcollect
index e88b309f1c02f7377c894a0c81e2fcb8e75e4c52..bd884c9a302523a758a2dd7e97bd8e7e5f9e2300 100755 (executable)
--- a/client/bin/nagcollect
+++ b/client/bin/nagcollect
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # NagCollect -- Nagios Data Collector for Passive Checks
-# Copyright (c)2009-2010 Alexander Barton, alex@barton.de
+# Copyright (c)2009-2011 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
@@ -35,8 +35,10 @@ function refreshTestScripts()
                # Update local test scripts
                Msg "Extracting scripts ..."
                mkdir -p /usr/local/lib/nagcollect
-               tar xzf "$tmp" -C /usr/local/lib/nagcollect --exclude "._*" --exclude "." ; r=$?
+               tar xzf "$tmp" -C /usr/local/lib/nagcollect -po \
+                --exclude "._*" --exclude ".DS_Store" ; r=$?
        fi
+       chmod -R a+rX /usr/local/lib/nagcollect
        rm -f "$tmp"
        return $r
 }
@@ -56,15 +58,15 @@ function submitService()
 [ -r "/usr/local/etc/nagcollect.conf" ] && . /usr/local/etc/nagcollect.conf
 [ -r "/etc/nagcollect.conf" ] && . /etc/nagcollect.conf
 
-[ -n "$SERVER_URL" -a -n "$CLIENT_KEY" -a -n "$CLIENT_ID" ] || \
-       Error "Configuration invalid, check SERVER_URL, CLIENT_KEY and CLIENT_ID variables!"
-
-if [ "$AUTOUPDATE" = 1 ]; then
+if [ -n "$SERVER_URL" -a "$AUTOUPDATE" = 1 ]; then
        Msg "Updating local test scripts:"
        refreshTestScripts || \
                Error "Failed to refresh test scripts from \"$SERVER_URL\" ($?)!"
 fi
 
+[ -n "$SERVER_URL" -a -n "$CLIENT_KEY" -a -n "$CLIENT_ID" ] || \
+       Error "Can't continue, configuration invalid: check SERVER_URL, CLIENT_KEY and CLIENT_ID variables!"
+
 Msg "Running test scripts:"
 
 ls -1 \