[X2Go-Commits] [buildscripts] 01/01: bin/build-rpm-package: fix up suse subdir removal/replacement.

[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 be6c17ea518d2f37f6ed791c107189b11bacf2d5
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Apr 30 23:20:35 2018 +0200

    bin/build-rpm-package: fix up suse subdir removal/replacement.
---
 bin/build-rpm-package | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 25067be..2200548 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -1017,8 +1017,10 @@ build_packages() {
 
 						DOWNLOAD_URL="$(sed -e "s/#VERSION#/${l_CODENAME}/" <<< "${DOWNLOAD_URL}")"
 
-						if [[ "${tmp_suse_major_version}" -gt "14" ]]; then
-							DOWNLOAD_URL="$(sed -e 's/#SUSESUBDIR#/suse/' <<< "${DOWNLOAD_URL}")"
+						if [[ "${tmp_suse_major_version}" -lt "15" ]]; then
+							DOWNLOAD_URL="$(sed -e 's_#SUSESUBDIR#_suse_' <<< "${DOWNLOAD_URL}")"
+						else
+							DOWNLOAD_URL="$(sed -e 's_#SUSESUBDIR#__' <<< "${DOWNLOAD_URL}")"
 						fi
 
 						if [[ "${tmp_suse_major_version}" != "9999" ]]; then

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git