From e4deb59a71e80537469c41336d7a1b6c4a821e19 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 30 Nov 2013 21:09:06 +0100 Subject: allow input of *_BUILD_FOR variable from outside the script --- 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 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) [/] {main,main/,nightly,nightly/} []"; 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) [/] {main,main/,nightly,nightly/} []"; 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() { -- cgit v1.2.3