From: Matthias Eble <psychotrahe@users.sourceforge.net>
Date: Sat, 7 Jul 2007 11:40:29 +0000 (+0000)
Subject: Changed order in -V/--version output
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a10569f1399c3549dbcd8f79f10cf49b0cbaadf6;p=nagiosplug.git

Changed order in -V/--version output
Fixed -V output for check_log and check_oracle


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1749 f882894a-f735-0410-b71e-b25c423dba1c
---

diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh
index 20c55f4..6f6e68c 100755
--- a/plugins-scripts/check_log.sh
+++ b/plugins-scripts/check_log.sh
@@ -116,11 +116,11 @@ while test -n "$1"; do
             exit $STATE_OK
             ;;
         --version)
-            print_revision $PROGNAME $VERSION
+            print_revision $PROGNAME $REVISION
             exit $STATE_OK
             ;;
         -V)
-            print_revision $PROGNAME $VERSION
+            print_revision $PROGNAME $REVISION
             exit $STATE_OK
             ;;
         --filename)
diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh
index 56962e3..0a8f152 100755
--- a/plugins-scripts/check_oracle.sh
+++ b/plugins-scripts/check_oracle.sh
@@ -89,11 +89,11 @@ case "$cmd" in
     exit $STATE_OK
     ;;
 --version)
-		print_revision $PLUGIN $REVISION
+		print_revision $PROGNAME $REVISION
     exit $STATE_OK
     ;;
 -V)
-		print_revision $PLUGIN $REVISION
+		print_revision $PROGNAME $REVISION
     exit $STATE_OK
     ;;
 esac
diff --git a/plugins-scripts/utils.sh.in b/plugins-scripts/utils.sh.in
index 7750716..b30b908 100644
--- a/plugins-scripts/utils.sh.in
+++ b/plugins-scripts/utils.sh.in
@@ -13,7 +13,7 @@ else
 fi
 
 print_revision() {
-	echo "$1 (@PACKAGE@ @VERSION@) $2"
+	echo "$1 v$2 (@PACKAGE@ @VERSION@)"
 	$ECHO "@WARRANTY@" | sed -e 's/\n/ /g'
 }