summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-04-01 23:57:35 +0200
committerMihai Moldovan <ionic@ionic.de>2015-04-01 23:57:35 +0200
commitac2f70e59befc349c1fd12084bc2b4782860741f (patch)
treebcb786af868ec051e6082da4124a8300184c32b0
parentcbe1ab1106cc56af4f2cc7e7100f030396c26ec8 (diff)
downloadbuildscripts-ac2f70e59befc349c1fd12084bc2b4782860741f.tar.gz
buildscripts-ac2f70e59befc349c1fd12084bc2b4782860741f.tar.bz2
buildscripts-ac2f70e59befc349c1fd12084bc2b4782860741f.zip
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.
-rwxr-xr-xbin/build-all-deb-packages2
-rwxr-xr-xbin/build-deb-package6
-rwxr-xr-xbin/build-nsis-package.sh4
-rwxr-xr-xbin/signtarballs2
-rwxr-xr-xbin/updatebuildmain2
-rwxr-xr-xbin/updatebuildrelease2
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