From 6a063505b2297d3f373dbd8774799adaa1f86849 Mon Sep 17 00:00:00 2001 From: Sven Nierlein Date: Tue, 26 Feb 2019 17:30:15 +0100 Subject: [PATCH] show 3.x in version --- Makefile.omd | 6 +++--- get_version | 4 ++-- packages/omd/omd | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.omd b/Makefile.omd index c9451359b..5ec2a86ad 100644 --- a/Makefile.omd +++ b/Makefile.omd @@ -1,8 +1,8 @@ # General settings included by all packages -OMD_VERSION = 2.90-labs-edition -OMD_SERIAL = 47 -OMD_PATCH_LEVEL = 1 # increase when creating servicepack releases +OMD_VERSION = 3.00-labs-edition +OMD_SERIAL = 48 +OMD_PATCH_LEVEL = 1 OMD_BASE = /omd OMD_PHYSICAL_BASE = /opt/omd OMD_ROOT = $(OMD_BASE)/versions/$(OMD_VERSION) diff --git a/get_version b/get_version index 7874bd38c..f62675385 100755 --- a/get_version +++ b/get_version @@ -14,11 +14,11 @@ if [ $? -eq 0 ]; then exit 0 fi -# if we are not on a exact tag, use the last tag and add the date +# if we are not on a exact tag, use the current version and add the date # ex.: v0.43.20101018 # "git describe --tag --abbrev=0 --always" does not work correctly with git versions < 1.7 # see issue #198 -version=`git tag -l | sed -e 's/^v//g' | sort -n | tail -n 1 | sed -e 's/-labs-edition//g'` +version=`grep OMD_VERSION Makefile.omd | head -n 1 | awk '{print $3}' |sed -e 's/-labs-edition//g'` if [ $? -eq 0 ]; then date=`date +%Y%m%d` major=`echo $version | cut -d . -f 1` diff --git a/packages/omd/omd b/packages/omd/omd index 4ae667bc4..3c5264cab 100755 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -33,7 +33,7 @@ import random import string from subprocess import * -OMD_VERSION = "2.90-labs-edition" +OMD_VERSION = "3.00-labs-edition" # Some global variables opt_verbose = False