summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-11-04 18:58:34 +0100
committerHolger Levsen <holger@layer-acht.org>2014-11-04 18:58:34 +0100
commite97a439c34f641fb0c1a64ddd51999dae3db7437 (patch)
tree54270bbf393c4dabc6ebccb378ba810e354e1fc2
parent3642063436dcb82dfb2a11b112909b6b2275fd01 (diff)
downloadjenkins.debian.net-e97a439c34f641fb0c1a64ddd51999dae3db7437.tar.xz
chroot-run: correctly handle variable types (fix artifact publishing)
-rwxr-xr-xbin/chroot-run.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/chroot-run.sh b/bin/chroot-run.sh
index c79a8b59..e771cf86 100755
--- a/bin/chroot-run.sh
+++ b/bin/chroot-run.sh
@@ -8,6 +8,11 @@ DEBUG=false
. /srv/jenkins/bin/common-functions.sh
common_init "$@"
+# cp artifacts back into workspace if this is set
+if [ "$ARTIFACTS" != "true" ] ; then
+ ARTIFACTS=false
+fi
+
# $1 = base distro
# $2 $3 ... = command to run inside a clean chroot running the distro in $1
@@ -90,7 +95,7 @@ cleanup() {
#
# publish artifacts
#
- if $ARTIFACTS ; then
+ if [ "$ARTIFACTS" = "true" ] ; then
CHANGES=$(ls -1 $CHROOT_TARGET/tmp/*_*.changes 2>/dev/null|| true)
dcmd cp $CHANGES $WORKSPACE/
fi