This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 4d6193c7a106006ae6ebe512e602e4217da7eb3b Author: Mihai Moldovan <ionic@ionic.de> Date: Sun May 10 03:45:13 2015 +0200 bin/build-{deb,rpm}-package: merge some other common changes from the nsis script. No functional difference. --- bin/build-deb-package | 12 ++++++++++-- bin/build-rpm-package | 14 ++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/bin/build-deb-package b/bin/build-deb-package index 2d3e763..d28abb7 100755 --- a/bin/build-deb-package +++ b/bin/build-deb-package @@ -37,10 +37,18 @@ REPOS_SERVER="packages.mydomain.org" PACKAGES_WITHOUT_OTHERMIRROR="keyring" GNUPGHOME="${HOME}/.gnupg" -test -z "${1}" && { echo "usage: $(basename "${0}") [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit 1; } +test -z "${1}" && { + exec >&2 + echo "usage: $(basename "${0}") [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]" + exit 1 +} PREFIX="$(cut -d"-" -f1 <<< "$(basename "${0}")")" -test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . "${HOME}/.buildscripts/${PREFIX}.conf" || { echo "${0} has no valid context prefix..." >&2; exit 1; } +test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . "${HOME}/.buildscripts/${PREFIX}.conf" || { + exec >&2 + echo "${0} has no valid context prefix..." >&2 + exit 1; +} : ${NO_DELAY:="no"} : ${FORCE_BUILD:="no"} diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 0ed0526..7b54e6a 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -18,8 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -export PATH="${HOME}/bin:${PATH}" - GIT_USER="gituser" GIT_HOSTNAME="git.mydomain.org" @@ -48,10 +46,18 @@ GNUPGHOME="${HOME}/.gnupg" OPENSUSE_DOWNLOAD_URL="http://download.opensuse.org/distribution/#VERSION#/repo/oss/suse/" SLE_DOWNLOAD_URL="/srv/mirrors/non-public/sle/#VERSION#/rpms/" -test -z "${1}" && { echo "usage: $(basename "${0}") [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit 1; } +test -z "${1}" && { + exec >&2 + echo "usage: $(basename "${0}") [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]" + exit 1 +} PREFIX="$(cut -d"-" -f1 <<< "$(basename "${0}")")" -test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . "${HOME}/.buildscripts/${PREFIX}.conf" || { echo "${0} has no valid context prefix..." >&2; exit 1; } +test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . "${HOME}/.buildscripts/${PREFIX}.conf" || { + exec >&2 + echo "${0} has no valid context prefix..." + exit 1 +} : ${NO_DELAY:="no"} : ${FORCE_BUILD:="no"} -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git