From 12e46121dbb8ddb131ba49b5d07b34d25100b502 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 20 Mar 2015 21:05:08 +0100 Subject: reproducible: improve language and shell robustness --- bin/reproducible_build.sh | 8 ++++---- bin/reproducible_schedule_on_demand.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index e281e896..e3f4a8ad 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -24,15 +24,15 @@ create_results_dirs() { } cleanup_all() { - if [ "$SAVE_ARTIFACTS" == 1 ] ; then + if [ "$SAVE_ARTIFACTS" = "1" ] ; then local hash=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w5 | head -1) local ARTIFACTS="artifacts/r00t-me/tmp-${hash}/${SUITE}/${PACKAGE}" mkdir -p "/var/lib/jenkins/userContent/$ARTIFACTS" cp -r $TMPDIR/* "/var/lib/jenkins/userContent/$ARTIFACTS" echo | tee -a ${RBUILDLOG} - echo "Artifacts from this build are preserved. They will be available for very short time so download them now if you want them." | tee -a ${RBUILDLOG} - echo "You shouldn't trust packages you downloaded from this host, they can contain malware or the worst of your fear, packaged in a debian format." | tee -a ${RBUILDLOG} - echo "If you are not afraid of facing your fears helping the world by investigating reproducible build issues, you can download the artifacts from the following url:" | tee -a ${RBUILDLOG} + echo "Artifacts from this build are preserved. They will be available for 72h only, so download them now if you want them." | tee -a ${RBUILDLOG} + echo "WARNING: You shouldn't trust packages you downloaded from this host, they can contain malware or the worst of your fears, packaged nicely in debian format." | tee -a ${RBUILDLOG} + echo "If you are not afraid facing your fears while helping the world by investigating reproducible build issues, you can download the artifacts from the following location:" | tee -a ${RBUILDLOG} echo "https://reproducible.debian.net/$ARTIFACTS" | tee -a ${RBUILDLOG} echo | tee -a ${RBUILDLOG} fi diff --git a/bin/reproducible_schedule_on_demand.sh b/bin/reproducible_schedule_on_demand.sh index c4bd9877..a4636bf4 100755 --- a/bin/reproducible_schedule_on_demand.sh +++ b/bin/reproducible_schedule_on_demand.sh @@ -23,11 +23,11 @@ if [ "$SUITE" = "sid" ] ; then fi ARTIFACTS=0 -if [ $1 = "artifacts" ] ; then +if [ "$1" = "artifacts" ] ; then ARTIFACTS=1 shift echo - echo "The artifacts of these builds will be saved. Look at the build log for the link" + echo "The artifacts of the build(s) will be saved to the location mentioned at the end of the build log(s)." echo fi -- cgit v1.2.3-54-g00ecf