summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/build-deb-package6
-rwxr-xr-xbin/build-rpm-package6
-rw-r--r--home/.buildscripts/itzks.conf2
-rw-r--r--home/.buildscripts/nwt.conf2
-rw-r--r--home/.buildscripts/x2go.conf4
5 files changed, 10 insertions, 10 deletions
diff --git a/bin/build-deb-package b/bin/build-deb-package
index 3a1ac3e..0ab5ee1 100755
--- a/bin/build-deb-package
+++ b/bin/build-deb-package
@@ -36,14 +36,14 @@ REPOS_SERVER="packages.mydomain.org"
PACKAGES_WITHOUT_OTHERMIRROR="keyring"
GNUPGHOME=$HOME/.gnupg
-FORCE_BUILD=${FORCE_BUILD:-"no"}
-DEB_BUILD_FOR=${DEB_BUILD_FOR:-"debian:$DEBIAN_DISTROS ubuntu:$UBUNTU_DISTROS"}
-
test -z $1 && { echo "usage: $(basename $0) [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit -1; }
PREFIX=$(echo `basename $0` | cut -d"-" -f1)
test -f ~/.buildscripts/$PREFIX.conf && . ~/.buildscripts/$PREFIX.conf || { echo "$0 has no valid context prefix..."; exit -1; }
+FORCE_BUILD=${FORCE_BUILD:-"no"}
+DEB_BUILD_FOR=${DEB_BUILD_FOR:-"debian:$DEBIAN_DISTROS ubuntu:$UBUNTU_DISTROS"}
+
set -ex
set_vars() {
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 8804a83..73e206e 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -37,14 +37,14 @@ REPOS_SERVER="packages.mydomain.org"
PACKAGES_WITHOUT_OTHERMIRROR="keyring"
GNUPGHOME=$HOME/.gnupg
-FORCE_BUILD=${FORCE_BUILD:-"no"}
-RPM_BUILD_FOR=${RPM_BUILD_FOR:-"fedora:$FEDORA_DISTROS epel:$EPEL_DISTROS"}
-
test -z $1 && { echo "usage: $(basename $0) [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit -1; }
PREFIX=$(echo `basename $0` | cut -d"-" -f1)
test -f ~/.buildscripts/$PREFIX.conf && . ~/.buildscripts/$PREFIX.conf || { echo "$0 has no valid context prefix..."; exit -1; }
+FORCE_BUILD=${FORCE_BUILD:-"no"}
+RPM_BUILD_FOR=${RPM_BUILD_FOR:-"fedora:$FEDORA_DISTROS epel:$EPEL_DISTROS"}
+
set -ex
set_vars() {
diff --git a/home/.buildscripts/itzks.conf b/home/.buildscripts/itzks.conf
index a7d562c..3bd5e64 100644
--- a/home/.buildscripts/itzks.conf
+++ b/home/.buildscripts/itzks.conf
@@ -8,7 +8,7 @@ DEBFULLNAME="ITZKS Packages"
GPG_KEY="E41B37C658842183"
DEB_DISTS_SUPPORTED="debian ubuntu"
-DEB_BUILD_FOR="debian:squeeze,wheezy,jessie,sid"
+DEB_BUILD_FOR="${DEB_BUILD_FOR:-"debian:squeeze,wheezy,jessie,sid"}
COMPONENT_MAIN="main"
COMPONENT_NIGHTLY="nightly"
diff --git a/home/.buildscripts/nwt.conf b/home/.buildscripts/nwt.conf
index 5176ae9..48c09b7 100644
--- a/home/.buildscripts/nwt.conf
+++ b/home/.buildscripts/nwt.conf
@@ -8,7 +8,7 @@ DEBEMAIL=debian@das-netzwerkteam.de
DEBFULLNAME="NWT Packages"
GPG_KEY="4DC41CF116990FF8"
DEB_DISTS_SUPPORTED="debian ubuntu"
-DEB_BUILD_FOR="debian:lenny,squeeze,wheezy,jessie,sid ubuntu:lucid,precise"
+DEB_BUILD_FOR=${DEB_BUILD_FOR:-"debian:lenny,squeeze,wheezy,jessie,sid ubuntu:lucid,precise"}
COMPONENT_MAIN="main"
COMPONENT_NIGHTLY="nightly"
diff --git a/home/.buildscripts/x2go.conf b/home/.buildscripts/x2go.conf
index 02de746..919271b 100644
--- a/home/.buildscripts/x2go.conf
+++ b/home/.buildscripts/x2go.conf
@@ -8,13 +8,13 @@ DEBEMAIL=git-admin@x2go.org
DEBFULLNAME="X2go Git Administrator"
GPG_KEY="F4A7678C9C6B0B2B"
DEB_DISTS_SUPPORTED="debian"
-DEB_BUILD_FOR="debian:squeeze,wheezy,jessie,sid"
+DEB_BUILD_FOR=${DEB_BUILD_FOR:-"debian:squeeze,wheezy,jessie,sid"}
RPMEMAIL=git-admin@x2go.org
RPMFULLNAME="X2go Git Administrator"
GPG_KEY="F4A7678C9C6B0B2B"
RPM_DISTS_SUPPORTED="fedora epel"
-RPM_BUILD_FOR="fedora:18,19,20,rawhide epel:6"
+RPM_BUILD_FOR=${RPM_BUILD_FOR:-"fedora:18,19,20,rawhide epel:6"}
RPM_REPOS_BASE=/srv/sites/x2go.org/packages/
COMPONENT_MAIN="main"