split-up DISTS_SUPPORTED var into DEB_DISTS_SUPPORTED and RPM_DISTS_SUPPORTED

5 files changed, 10 insertions, 10 deletions

diff --git a/bin/build-deb-package b/bin/build-deb-package
index 392e335..3a1ac3e 100755
--- a/bin/build-deb-package
+++ b/bin/build-deb-package
@@ -25,7 +25,7 @@ GIT_HOSTNAME="git.mydomain.org"
 DEBEMAIL="firstname.lastname@mydomain.org"
 DEBFULLNAME="Firstname Lastname"
 GPG_KEY=
-DISTS_SUPPORTED="debian ubuntu"
+DEB_DISTS_SUPPORTED="debian ubuntu"
 DEBIAN_DISTROS="lenny,squeeze,wheezy,jessie,sid"
 UBUNTU_DISTROS="lucid,precise"
 
@@ -136,7 +136,7 @@ clear_pkgdist() {
 	echo "$DEB_BUILD_FOR" | sed -e 's/ /\n/g' | while read line; do
 		l_DIST="$(echo ${line/: /:} | cut -d":" -f1 | tr [:upper:] [:lower:])"
 		l_CODENAMES="${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | sed -e 's/,/ /g' | tr [:upper:] [:lower:])}"
-		echo "$DISTS_SUPPORTED" | grep $l_DIST >/dev/null && {
+		echo "$DEB_DISTS_SUPPORTED" | grep $l_DIST >/dev/null && {
 			for l_CODENAME in $l_CODENAMES; do
 
 				# in case we build a special CODENAME (squeeze, wheezy, lucid, ...) do skip
@@ -178,7 +178,7 @@ build_packages() {
 	echo "$DEB_BUILD_FOR" | sed -e 's/ /\n/g' | while read line; do
 		l_DIST="$(echo ${line/: /:} | cut -d":" -f1 | tr [:upper:] [:lower:])"
 		l_CODENAMES="${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | sed -e 's/,/ /g' | tr [:upper:] [:lower:])}"
-		echo "$DISTS_SUPPORTED" | grep $l_DIST >/dev/null && {
+		echo "$DEB_DISTS_SUPPORTED" | grep $l_DIST >/dev/null && {
 			for l_CODENAME in $l_CODENAMES; do
 
 				# in case we build a special CODENAME (squeeze, wheezy, lucid, ...) do skip
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 48146a0..8804a83 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -25,7 +25,7 @@ GIT_HOSTNAME="git.mydomain.org"
 RPMEMAIL="firstname.lastname@mydomain.org"
 RPMFULLNAME="Firstname Lastname"
 GPG_KEY=
-DISTS_SUPPORTED="fedora epel"
+RPM_DISTS_SUPPORTED="fedora epel"
 FEDORA_DISTROS="18,19,20,rawhide"
 EPEL_DISTROS="6"
 RPM_REPOS_BASE=/var/www/
@@ -131,7 +131,7 @@ clear_pkgdist() {
 	echo "$RPM_BUILD_FOR" | sed -e 's/ /\n/g' | while read line; do
 		l_DIST="$(echo ${line/: /:} | cut -d":" -f1 | tr [:upper:] [:lower:])"
 		l_CODENAMES="${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | sed -e 's/,/ /g' | tr [:upper:] [:lower:])}"
-		echo "$DISTS_SUPPORTED" | grep $l_DIST >/dev/null && {
+		echo "$RPM_DISTS_SUPPORTED" | grep $l_DIST >/dev/null && {
 			for l_CODENAME in $l_CODENAMES; do
 
 				# in case we build a special CODENAME (squeeze, wheezy, lucid, ...) do skip
@@ -191,7 +191,7 @@ build_packages() {
 	echo "$RPM_BUILD_FOR" | sed -e 's/ /\n/g' | while read line; do
 		l_DIST="$(echo ${line/: /:} | cut -d":" -f1 | tr [:upper:] [:lower:])"
 		l_CODENAMES="${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | sed -e 's/,/ /g' | tr [:upper:] [:lower:])}"
-		echo "$DISTS_SUPPORTED" | grep $l_DIST >/dev/null && {
+		echo "$RPM_DISTS_SUPPORTED" | grep $l_DIST >/dev/null && {
 			for l_CODENAME in $l_CODENAMES; do
 
 				test -z $CODENAMES || echo $line | grep $CODENAMES || break
diff --git a/home/.buildscripts/itzks.conf b/home/.buildscripts/itzks.conf
index 91e271b..a7d562c 100644
--- a/home/.buildscripts/itzks.conf
+++ b/home/.buildscripts/itzks.conf
@@ -7,7 +7,7 @@ DEBEMAIL=itzks-packages@it-zukunft-schule.de
 DEBFULLNAME="ITZKS Packages"
 GPG_KEY="E41B37C658842183"
 
-DISTS_SUPPORTED="debian ubuntu"
+DEB_DISTS_SUPPORTED="debian ubuntu"
 DEB_BUILD_FOR="debian:squeeze,wheezy,jessie,sid"
 
 COMPONENT_MAIN="main"
diff --git a/home/.buildscripts/nwt.conf b/home/.buildscripts/nwt.conf
index ac04488..5176ae9 100644
--- a/home/.buildscripts/nwt.conf
+++ b/home/.buildscripts/nwt.conf
@@ -7,7 +7,7 @@ GIT_SSH_PORT=32032
 DEBEMAIL=debian@das-netzwerkteam.de
 DEBFULLNAME="NWT Packages"
 GPG_KEY="4DC41CF116990FF8"
-DISTS_SUPPORTED="debian ubuntu"
+DEB_DISTS_SUPPORTED="debian ubuntu"
 DEB_BUILD_FOR="debian:lenny,squeeze,wheezy,jessie,sid ubuntu:lucid,precise"
 
 COMPONENT_MAIN="main"
diff --git a/home/.buildscripts/x2go.conf b/home/.buildscripts/x2go.conf
index 3373649..02de746 100644
--- a/home/.buildscripts/x2go.conf
+++ b/home/.buildscripts/x2go.conf
@@ -7,13 +7,13 @@ GIT_SSH_PORT=32032
 DEBEMAIL=git-admin@x2go.org
 DEBFULLNAME="X2go Git Administrator"
 GPG_KEY="F4A7678C9C6B0B2B"
-DISTS_SUPPORTED="debian"
+DEB_DISTS_SUPPORTED="debian"
 DEB_BUILD_FOR="debian:squeeze,wheezy,jessie,sid"
 
 RPMEMAIL=git-admin@x2go.org
 RPMFULLNAME="X2go Git Administrator"
 GPG_KEY="F4A7678C9C6B0B2B"
-DISTS_SUPPORTED="fedora epel"
+RPM_DISTS_SUPPORTED="fedora epel"
 RPM_BUILD_FOR="fedora:18,19,20,rawhide epel:6"
 RPM_REPOS_BASE=/srv/sites/x2go.org/packages/