diff options
| author | Mattia Rizzolo <mattia@debian.org> | 2017-01-19 14:15:21 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2017-01-19 14:15:56 +0100 |
| commit | 0482c0af81fab771dfe596f43d4d07b5827a5613 (patch) | |
| tree | 6070b0ddbd548ee96d2677b16a7d4951509f8b57 /bin/reproducible_html_dashboard.sh | |
| parent | 7745ba7928d7c757bcb241fac6da7a1fa75c969c (diff) | |
| download | jenkins.debian.net-0482c0af81fab771dfe596f43d4d07b5827a5613.tar.xz | |
reproducible debian: dashboard: don't accidentally trash the original TIMESPAN while looping
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'bin/reproducible_html_dashboard.sh')
| -rwxr-xr-x | bin/reproducible_html_dashboard.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bin/reproducible_html_dashboard.sh b/bin/reproducible_html_dashboard.sh index 4936adfc..107425ed 100755 --- a/bin/reproducible_html_dashboard.sh +++ b/bin/reproducible_html_dashboard.sh @@ -303,19 +303,20 @@ _average_builds_per_day() { local OLDEST_BUILD="$(query_db "SELECT build_date FROM stats_build WHERE architecture='$ARCH' ORDER BY build_date ASC LIMIT 1")" local DAY_DIFFS="$(( ($(date -d "$DATE" +%s) - $(date -d "$OLDEST_BUILD" +%s)) / (60*60*24) ))" local DISCLAIMER="" - if [ $DAY_DIFFS -lt $TIMESPAN_RAW ]; then + local TIMESPAN="$TIMESTAN_RAW" + if [ $DAY_DIFFS -lt $TIMESPAN ]; then # this is a new architecture, there are fewer days to compare to. DISCLAIMER=" <span style=\"font-size: 0.8em;\">(in the last $DAY_DIFFS days)</span>" - TIMESPAN_RAW=$DAY_DIFF + TIMESPAN=$DAY_DIFF fi if [ $DAY_DIFFS -ge $MIN_DAYS ]; then # find stats for since the day before $TIMESPAN_RAW days ago, # since no stats exist for today yet. - local TIMESPAN="$(echo $TIMESPAN_RAW-1|bc)" + local TIMESPAN="$(echo $TIMESPAN-1|bc)" local TIMESPAN_DATE=$(date '+%Y-%m-%d %H:%M' -d "- $TIMESPAN days") RESULT=$(query_db "SELECT COUNT(r.build_date) FROM stats_build AS r WHERE r.build_date > '$TIMESPAN_DATE' AND r.architecture='$ARCH'") - RESULT="$(echo $RESULT/$TIMESPAN_RAW|bc)" + RESULT="$(echo $RESULT/$TIMESPAN|bc)" else # very new arch with too few resulsts to care about stats RESULT=" " |