Skip to content

Commit

Permalink
show 3.x in version
Browse files Browse the repository at this point in the history
  • Loading branch information
sni committed Feb 26, 2019
1 parent 0350b21 commit 6a06350
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Makefile.omd
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions get_version
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion packages/omd/omd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6a06350

Please sign in to comment.