[X2Go-Commits] [buildscripts] 01/01: bin/build-rpm-package: extract major version from l_CODENAME for *SUSE and compare only that.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 21264acbe6c7cf467aee08bc752c9e393feba7ff
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Nov 25 03:32:51 2016 +0100

    bin/build-rpm-package: extract major version from l_CODENAME for *SUSE and compare only that.
---
 bin/build-rpm-package |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index c970bbe..b19bc38 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -972,7 +972,16 @@ upload_packages() {
 						typeset distro_string=""
 						if [ "${l_DIST}" = "opensuse" ]; then
 							distro_string="OpenSuSE:"
-							[ "${l_CODENAME}" -gt "13" ] && distro_string="${distro_string}Leap:"
+
+							typeset -i tmp_suse_major_version="0"
+							tmp_suse_major_version="$(sed -e 's/\([0-9]*\).*/\1/' <<< "${l_CODENAME}")"
+
+							if [ "x${tmp_suse_major_version}" = "x0" ]; then
+								echo "Unable to extract SUSE version."
+								exit 1
+							fi
+
+							[ "${tmp_suse_major_version}" -gt "13" ] && distro_string="${distro_string}Leap:"
 							distro_string="${distro_string}${l_CODENAME}"
 						else
 							distro_string="SLE:"

--
Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git