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 20c55f4ed029bef1a50d7a2316b26cd844527a73..6f6e68c21994c8c26fcaf51860bd0c71070ad5cf 100755 (executable)
--- 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 56962e37ccc0093b29d0aea68eb45e63fde51145..0a8f1521ad604354d67144a765c553881286bf88 100755 (executable)
--- 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 7750716be4f26944f487ca0eb689e94a1195b58c..b30b908395921dea466916293fb7f7e251e94521 100644 (file)
--- 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'
 }