summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-02-27 11:15:31 +0100
committerHolger Levsen <holger@layer-acht.org>2015-02-27 11:15:31 +0100
commit2f5f8f0e378b4696726f63ff9bf390fe99359994 (patch)
tree4c5d26f2cc0f07121f50bbd126d19d15a2e31cc7
parentd11f7a391f7502cc642412d1e589bbcb59a6ba20 (diff)
downloadjenkins.debian.net-2f5f8f0e378b4696726f63ff9bf390fe99359994.tar.xz
disable debugging again and dont use local variables with the same names as globals
-rwxr-xr-xbin/schroot-create.sh11
1 files changed, 3 insertions, 8 deletions
diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
index d69b1a28..58e2925c 100755
--- a/bin/schroot-create.sh
+++ b/bin/schroot-create.sh
@@ -5,7 +5,7 @@
# Copyright 2014 Joachim Breitner <nomeata@debian.org>
# released under the GPLv=2
-DEBUG=true
+DEBUG=false
. /srv/jenkins/bin/common-functions.sh
common_init "$@"
@@ -55,8 +55,7 @@ fi
# create script to add key for reproducible repo
#
add_repokey() {
- TMPFILE=$1
- cat > $TMPFILE <<- EOF
+ cat > $1 <<- EOF
echo "-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.12 (GNU/Linux)
@@ -87,8 +86,6 @@ Mb0BawlXZui0MNUSnZtxHMxrjejdvZdqtskHl9srB1QThH0jasmUqbQPxCnxMbf1
=X8YA
-----END PGP PUBLIC KEY BLOCK-----" | apt-key add -
EOF
- echo $TMPFILE
- ls -la $TMPFILE
}
bootstrap() {
@@ -107,10 +104,8 @@ bootstrap() {
if [ "$1" == "reproducible" ] ; then
TMPFILE=$(mktemp -u)
- echo $TMPFILE
add_repokey $CHROOT_TARGET/$TMPFILE
- ls -la $CHROOT_TARGET/$TMPFILE
- sudo chroot $CHROOT_TARGET bash -- $TMPFILE
+ sudo chroot $CHROOT_TARGET bash $TMPFILE
rm $TMPFILE
shift
fi