Use new helper script version.sh to always get the version components right, no risk of undefined version components in VERSION files.

Author: sunweaver

Makefile

@@ -19,10 +19,10 @@ NXLIBDIR    ?= $(PREFIX)/lib/nx
 X2GOLIBDIR  ?= $(PREFIX)/lib/x2go
 CONFIGURE   ?= ./configure
 
-NX_VERSION_MAJOR=$(shell cat VERSION | cut -d"." -f1)
-NX_VERSION_MINOR=$(shell cat VERSION | cut -d"." -f2)
-NX_VERSION_MICRO=$(shell cat VERSION | cut -d"." -f3)
-NX_VERSION_PATCH=$(shell cat VERSION | cut -d"." -f4)
+NX_VERSION_MAJOR=$(shell ./version.sh 1)
+NX_VERSION_MINOR=$(shell ./version.sh 2)
+NX_VERSION_MICRO=$(shell ./version.sh 3)
+NX_VERSION_PATCH=$(shell ./version.sh 4)
 
 SHELL:=/bin/bash
 

version.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# Copyright (C) 2015 Mihai Moldovan <ionic@ionic.de>
+# Copyright (C) 2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.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.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+COMPONENT="$1"
+VERSION_FILE="VERSION"
+
+[ -z "$COMPONENT" ] && { echo "usage: $(basename $0) <position-in-version-number>"; exit 1; }
+
+# More than one line is not supported.
+VER="$(head -n "1" "${VERSION_FILE}" | cut -d"." -f"${COMPONENT}")"
+
+[ "x${VER}" = "x" ] && VER="0"
+
+printf "${VER}"