This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from 037cc48 bin/build-rpm-package: remove stupid sedism. new cc20e6d bin/build-rpm-package: change -1 return codes to 1. new cbe1ab1 bin/build-{deb,nsis,rpm}-package: quote $@ variable to pass all arguments correctly to set_vars. new ac2f70e bin/{build-{all-deb-packages,deb-package,nsis-package.sh},signtarballs,updatebuild{main,release}}: don't use a negative exit status. It was a bad idea to begin with. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: bin/build-all-deb-packages | 2 +- bin/build-deb-package | 8 ++++---- bin/build-nsis-package.sh | 6 +++--- bin/build-rpm-package | 42 +++++++++++++++++++++--------------------- bin/signtarballs | 2 +- bin/updatebuildmain | 2 +- bin/updatebuildrelease | 2 +- 7 files changed, 32 insertions(+), 32 deletions(-) -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit cc20e6d4dda2d8d7812b55de4241509d18f6cf50 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Apr 1 23:44:43 2015 +0200 bin/build-rpm-package: change -1 return codes to 1. --- bin/build-rpm-package | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 24e2fee..ff26914 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -48,10 +48,10 @@ 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 && { 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; } +test -f ~/.buildscripts/$PREFIX.conf && . ~/.buildscripts/$PREFIX.conf || { echo "$0 has no valid context prefix..."; exit 1; } NO_DELAY=${NO_DELAY:-"no"} FORCE_BUILD=${FORCE_BUILD:-"no"} @@ -73,7 +73,7 @@ cleanup () { case "${TMP_MOCK_CFG_DIR}" in ("${TEMP_BASE}"*) ;; (*) echo "Warning: mock temporary config directory is not matching the temporary file base dir ${TEMP_BASE}. Not doing cleanup." >&2 - exit -1 + exit 1 ;; esac @@ -149,7 +149,7 @@ set_vars() { CHECKOUT="${3:-master}" else echo "error: no such package component area for this Git project. Aborting..." - exit -1 + exit 1 fi # the DATE might be given as ,,today'' from the command line [ "x$DATE" = "xtoday" ] && DATE="$(date +%Y%m%d)" @@ -183,7 +183,7 @@ check_mock_version_atleast () { if [ -n "${SANITY_CHECK_MAJOR}" ] || [ -n "${SANITY_CHECK_MINOR}" ] || [ -n "${SANITY_CHECK_PATCH}" ]; then echo "Error: input parameters of ${FUNCNAME}() are not pure integers and failed sanity check." >&2 - exit -1 + exit 1 fi typeset MOCK_VER="$(mock --version)" @@ -197,7 +197,7 @@ check_mock_version_atleast () { if [ -z "${MOCK_VER}" ]; then echo "Error: the reported mock version can not be handled by ${FUNCNAME}()." >&2 - exit -1 + exit 1 fi # The reason for this weird [0-9][0-9]* construct is that POSIX BRE does only specify * @@ -210,7 +210,7 @@ check_mock_version_atleast () { if [ -z "${MOCK_VER_MAJOR}" ] || [ -z "${MOCK_VER_MINOR}" ] || [ -z "${MOCK_VER_PATCH}" ]; then echo "Error: unable to parse mock version in ${FUNCNAME}()." >&2 - exit -1 + exit 1 else typeset ret="1" if [ "${MOCK_VER_MAJOR}" -gt "${MAJOR}" ]; then @@ -274,7 +274,7 @@ create_mock_config () { # MOCK_BASE CUSTOM_REPO COMPONENT TARGET TMP_REGEX='^([[:alpha:]]+)-([[:alnum:]_]+)-[[:alnum:]_]+\.cfg$' if [[ ! "${MOCK_BASE}" =~ ${TMP_REGEX} ]]; then echo "Error: MOCK_BASE parameter not well formed. Must be: 'distro-version-arch.cfg'." >&2 - exit -1 + exit 1 else DISTRO="${BASH_REMATCH[1]}" VERSION="${BASH_REMATCH[2]}" @@ -288,13 +288,13 @@ create_mock_config () { # MOCK_BASE CUSTOM_REPO COMPONENT TARGET # Must be plain file. if [[ "${!CFG_FILE}" =~ ${TMP_REGEX} ]]; then echo "Error: (implicit) ${CFG_FILE} parameter must not be a path but a simple file name." >&2 - exit -1 + exit 1 fi # Must exist and be readable. if [ ! -f "${RPM_MOCK_CONFIG_DIR}/${!CFG_FILE}" ] || [ ! -r "${RPM_MOCK_CONFIG_DIR}/${!CFG_FILE}" ]; then echo "Error: ${CFG_FILE} parameter must exist, be a regular file and readable." >&2 - exit -1 + exit 1 fi done @@ -310,7 +310,7 @@ create_mock_config () { # MOCK_BASE CUSTOM_REPO COMPONENT TARGET if [ "${TARGET}" != "base" ] && [ "${TARGET}" != "full" ]; then echo "Error: TARGET parameter must be either full or base." >&2 - exit -1 + exit 1 fi # Create temporary directory for our soon-to-be temporary mock config file, @@ -319,14 +319,14 @@ create_mock_config () { # MOCK_BASE CUSTOM_REPO COMPONENT TARGET TMP_MOCK_CFG_DIR="$(mktemp -d --tmpdir="${TEMP_BASE}" "${RPM_EXTRA_REPO_MOCK_CONFIG_BASE}-mock-$(repeat_str "X" "24")")" if [ "$?" -ne "0" ]; then echo "Error: creating mock temporary config directory failed. Aborting." >&2 - exit -1 + exit 1 fi fi TMP_MOCK_CFG_FILE="$(mktemp --tmpdir="${TEMP_BASE}" "$(basename "${TMP_MOCK_CFG_DIR}")/${MOCK_BASE%.cfg}-${RPM_EXTRA_REPO_MOCK_CONFIG_BASE}-${COMPONENT}-${TARGET}.$(repeat_str "X" "24").cfg")" if [ "$?" -ne "0" ]; then echo "Error: creating mock temporary config file failed. Aborting." >&2 - exit -1 + exit 1 fi # Save old input field separator value and set it to newline only. @@ -414,7 +414,7 @@ create_mock_config () { # MOCK_BASE CUSTOM_REPO COMPONENT TARGET echo "${line}" >> "${TMP_MOCK_CFG_FILE}" elif [ "${REPO_START}" -eq "0" ] && [[ "${line}" =~ ${TMP_REGEX_END} ]]; then echo "Error: Parsing mock base config file failed: unexpected end of yum configuration, no start found." >&2 - exit -1 + exit 1 else # Pass-through. echo "${line}" >> "${TMP_MOCK_CFG_FILE}" @@ -493,7 +493,7 @@ get_extra_repository () { *) echo "Error: unknown type passed to ${FUNCNAME}()" >&2 echo "Valid values: suse, redhat." >&2 - exit -1 + exit 1 ;; esac @@ -635,7 +635,7 @@ build_packages() { else cat $PKGDIST/$l_DIST/$l_CODENAME/rpmbuild/SRPMS/build.log rm -Rf "$TEMP_DIR" - exit -1 + exit 1 fi fi @@ -685,7 +685,7 @@ build_packages() { rpmsign-unattended -D "%_gpg_name debian@x2go.org" --addsign "$PKGDIST/$l_DIST/$l_CODENAME/SRPM/"*.rpm else rm -Rf "$TEMP_DIR" - exit -1 + exit 1 fi else rm -f $PKGDIST/$l_DIST/$l_CODENAME/x86_64/build.log @@ -719,7 +719,7 @@ build_packages() { else cat $PKGDIST/$l_DIST/$l_CODENAME/x86_64/build.log rm -Rf "$TEMP_DIR" - exit -1 + exit 1 fi done fi @@ -765,7 +765,7 @@ build_packages() { fi else rm -Rf "$TEMP_DIR" - exit -1 + exit 1 fi else while [ -d ~mock/${l_DIST}-${l_CODENAME}-i386 ]; do @@ -800,7 +800,7 @@ build_packages() { else cat $PKGDIST/$l_DIST/$l_CODENAME/i386/build.log rm -Rf "$TEMP_DIR" - exit -1 + exit 1 fi done fi -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit cbe1ab1106cc56af4f2cc7e7100f030396c26ec8 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Apr 1 23:48:51 2015 +0200 bin/build-{deb,nsis,rpm}-package: quote $@ variable to pass all arguments correctly to set_vars. --- bin/build-deb-package | 2 +- bin/build-nsis-package.sh | 2 +- bin/build-rpm-package | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/build-deb-package b/bin/build-deb-package index a488db9..0ef3f6c 100755 --- a/bin/build-deb-package +++ b/bin/build-deb-package @@ -345,7 +345,7 @@ delay_build() { } ### MAIN ### -set_vars $@ && { +set_vars "$@" && { if [ "x$(basename $0)" = "x$PREFIX-build-deb-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-deb-package" ]; then # Treat any value other than "no" and "0" as true. cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || ( [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] ) && { diff --git a/bin/build-nsis-package.sh b/bin/build-nsis-package.sh index 90cf455..f87f872 100755 --- a/bin/build-nsis-package.sh +++ b/bin/build-nsis-package.sh @@ -266,7 +266,7 @@ delay_build() { } ### MAIN ### -set_vars $@ && { +set_vars "$@" && { if [ "x$(basename $0)" = "xbuild-nsis-package.sh" ] || [ "x$(basename $0)" = "xbuild+upload-nsis-package.sh" ]; then # Treat any value other than "no" and "0" as true. cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || ( [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] ) && { diff --git a/bin/build-rpm-package b/bin/build-rpm-package index ff26914..947f108 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -879,7 +879,7 @@ delay_build() { ### MAIN ### -set_vars $@ && { +set_vars "$@" && { if [ "x$(basename $0)" = "x$PREFIX-build-rpm-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-rpm-package" ]; then # Treat any value other than "no" and "0" as true. cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || ( [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] ) && { -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit ac2f70e59befc349c1fd12084bc2b4782860741f Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Apr 1 23:57:35 2015 +0200 bin/{build-{all-deb-packages,deb-package,nsis-package.sh},signtarballs,updatebuild{main,release}}: don't use a negative exit status. It was a bad idea to begin with. --- bin/build-all-deb-packages | 2 +- bin/build-deb-package | 6 +++--- bin/build-nsis-package.sh | 4 ++-- bin/signtarballs | 2 +- bin/updatebuildmain | 2 +- bin/updatebuildrelease | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/build-all-deb-packages b/bin/build-all-deb-packages index 1e3b6bb..08fe9a6 100755 --- a/bin/build-all-deb-packages +++ b/bin/build-all-deb-packages @@ -27,7 +27,7 @@ APP_PACKAGES_NIGHTLY= APP_PACKAGES_MAIN= PREFIX=$(echo `basename $0` | cut -d"-" -f1) -test -f ~/.buildscripts/$PREFIX.conf && . ~/.buildscripts/$PREFIX.conf || { echo "$0 has no valid context prefix..."; exit -1; } +test -f ~/.buildscripts/$PREFIX.conf && . ~/.buildscripts/$PREFIX.conf || { echo "$0 has no valid context prefix..."; exit 1; } set -ex diff --git a/bin/build-deb-package b/bin/build-deb-package index 0ef3f6c..997c403 100755 --- a/bin/build-deb-package +++ b/bin/build-deb-package @@ -36,10 +36,10 @@ 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 && { 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; } +test -f ~/.buildscripts/$PREFIX.conf && . ~/.buildscripts/$PREFIX.conf || { echo "$0 has no valid context prefix..."; exit 1; } NO_DELAY=${NO_DELAY:-"no"} FORCE_BUILD=${FORCE_BUILD:-"no"} @@ -76,7 +76,7 @@ set_vars() { CHECKOUT="${3:-master}" else echo "error: no such package component area for this Git project. Aborting..." - exit -1 + exit 1 fi # the DATE might be given as ,,today'' from the command line [ "x$DATE" = "xtoday" ] && DATE="$(date +%Y%m%d)" diff --git a/bin/build-nsis-package.sh b/bin/build-nsis-package.sh index f87f872..a5b023e 100755 --- a/bin/build-nsis-package.sh +++ b/bin/build-nsis-package.sh @@ -41,7 +41,7 @@ COMPONENT_BUNDLES="baikal" REPOS_SERVER="code.x2go.org" 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 && { echo "usage: $(basename $0) [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit 1; } NO_DELAY=${NO_DELAY:-"no"} FORCE_BUILD=${FORCE_BUILD:-"yes"} @@ -78,7 +78,7 @@ set_vars() { CHECKOUT="${3:-master}" else echo "error: no such package component area for this Git project. Aborting..." - exit -1 + exit 1 fi # the DATE might be given as ,,today'' from the command line [ "x$DATE" = "xtoday" ] && DATE="$(date +%Y%m%d)" diff --git a/bin/signtarballs b/bin/signtarballs index 31c95ae..e7f50ce 100755 --- a/bin/signtarballs +++ b/bin/signtarballs @@ -1,6 +1,6 @@ #!/bin/bash -test -d _releases_ && cd _releases_ || test -d ../_releases_ && cd ../_releases_ || exit -1 +test -d _releases_ && cd _releases_ || test -d ../_releases_ && cd ../_releases_ || exit 1 find * -type f | egrep ".*(\.zip|\.tar\.gz|\.exe|\.dmg)$" | while read tarball; do test -f "${tarball}.md5" || { printf "md5: "; md5sum "${tarball}" | tee "${tarball}.md5"; } diff --git a/bin/updatebuildmain b/bin/updatebuildmain index 9106e0a..b7144d0 100755 --- a/bin/updatebuildmain +++ b/bin/updatebuildmain @@ -27,7 +27,7 @@ ORIGIN=${2:-origin} test -z $1 || test -d ./.git || { echo "usage: $(basename $0) <REF>" echo "Call this command from within the base folder of a Git project's working copy..." - exit -1 + exit 1 } # update the build-main branch with our newest blessed reference diff --git a/bin/updatebuildrelease b/bin/updatebuildrelease index d5e5eb8..665778a 100755 --- a/bin/updatebuildrelease +++ b/bin/updatebuildrelease @@ -28,7 +28,7 @@ ORIGIN=${3:-origin} test -z $1 || test -d ./.git || { echo "usage: $(basename $0) <REF>" echo "Call this command from within the base folder of a Git project's working copy..." - exit -1 + exit 1 } # update the build-main branch with our newest blessed reference -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
-
git-admin＠x2go.org