Enhance output of "nagcollecttest" script

[nagcollect.git] / client / bin / nagcollect

diff --git a/client/bin/nagcollect b/client/bin/nagcollect
index 6602c5adab383ae757627ab2af4b5fb9dc7ab4b1..71180a11718748a2b3e00a5c9af1b70dcb02976c 100755 (executable)
--- a/client/bin/nagcollect
+++ b/client/bin/nagcollect
@@ -1,7 +1,13 @@
 #!/bin/bash
 #
 # NagCollect -- Nagios Data Collector for Passive Checks
-# Copyright (c)2009 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
+# 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.
 #
 
 NAME=`basename "$0"`
@@ -29,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 ; 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
 }
@@ -38,11 +46,11 @@ function refreshTestScripts()
 function submitService()
 {
        curl --insecure --fail --output /dev/null --silent --max-time $MAXTIME \
-               --data-urlencode "key=$CLIENT_KEY" \
-               --data-urlencode "host=$CLIENT_ID" \
-               --data-urlencode "service=$1" \
-               --data-urlencode "status=$2" \
-               --data-urlencode "text=$3" \
+               --data "key=$CLIENT_KEY" \
+               --data "host=$CLIENT_ID" \
+               --data "service=$1" \
+               --data "status=$2" \
+               --data "text=$3" \
                "${SERVER_URL}/nagcollect.php" ; r=$?
        return $r
 }