From 3cb9042cf2c5b99f79c8e7d1963ba927eb421d9c Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 30 Nov 2013 21:03:31 +0100 Subject: split-up DISTS_SUPPORTED var into DEB_DISTS_SUPPORTED and RPM_DISTS_SUPPORTED --- bin/build-deb-package | 6 +++--- bin/build-rpm-package | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'bin') 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 -- cgit v1.2.3