reproducible: refactor SPOKENTARGET

4 files changed, 14 insertions, 30 deletions

diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 65b58af1..395db22e 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -78,23 +78,17 @@ init_html() {
 	ALLSTATES="reproducible FTBR FTBFS 404 not_for_us blacklisted"
 	ALLVIEWS="issues notes no_notes scheduled last_24h last_48h all_abc dd-list repo_stats pkg_sets stats"
 	GLOBALVIEWS="issues notes no_notes repo_stats pkg_sets stats"
-	SPOKENTARGET["reproducible"]="packages in $SUITE which built reproducibly"
-	SPOKENTARGET["FTBR"]="packages in $SUITE which failed to build reproducibly"
-	SPOKENTARGET["FTBFS"]="packages in $SUITE which failed to build from source"
-	SPOKENTARGET["404"]="packages in $SUITE where the sources failed to download"
-	SPOKENTARGET["not_for_us"]="packages in $SUITE which should not be build on 'amd64'"
-	SPOKENTARGET["blacklisted"]="packages in $SUITE which have been blacklisted"
-	SPOKENTARGET["issues"]="known issues related to reproducible builds"
+	SPOKENTARGET["issues"]="issues"
 	SPOKENTARGET["notes"]="packages with notes"
 	SPOKENTARGET["no_notes"]="packages without notes"
-	SPOKENTARGET["scheduled"]="packages in $SUITE currently scheduled for testing for build reproducibility"
-	SPOKENTARGET["last_24h"]="packages in $SUITE tested in the last 24h"
-	SPOKENTARGET["last_48h"]="packages in $SUITE tested in the last 48h"
-	SPOKENTARGET["all_abc"]="all tested packages in $SUITE (sorted alphabetically)"
-	SPOKENTARGET["dd-list"]="maintainers of unreproducible packages in $SUITE"
-	SPOKENTARGET["repo_stats"]="statistics about the reproducible builds apt repository"
-	SPOKENTARGET["pkg_sets"]="statistics about reproducible builds of specific package sets in $SUITE"
-	SPOKENTARGET["stats"]="various statistics about reproducible builds for $SUITE"
+	SPOKENTARGET["scheduled"]="currently scheduled"
+	SPOKENTARGET["last_24h"]="packages tested in the last 24h"
+	SPOKENTARGET["last_48h"]="packages tested in the last 48h"
+	SPOKENTARGET["all_abc"]="all tested packages (sorted alphabetically)"
+	SPOKENTARGET["dd-list"]="maintainers of unreproducible packages"
+	SPOKENTARGET["repo_stats"]="apt repository stats"
+	SPOKENTARGET["pkg_sets"]="package sets stats"
+	SPOKENTARGET["stats"]="stats"
 	# query some data we need everywhere
 	AMOUNT=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT count(*) FROM sources WHERE suite=\"${SUITE}\"")
 	COUNT_TOTAL=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT COUNT(*) FROM results AS r JOIN sources AS s ON r.package_id=s.id WHERE s.suite=\"${SUITE}\"")
@@ -160,17 +154,7 @@ write_page_header() {
 		write_page "</li>"
 	done
 	for TARGET in $ALLVIEWS ; do
-		if [ "$TARGET" = "issues" ] || [ "$TARGET" = "stats" ] ; then
-			SPOKEN_TARGET=$TARGET
-		elif [ "$TARGET" = "scheduled" ] ; then
-			SPOKEN_TARGET="currently scheduled"
-		elif [ "$TARGET" = "pkg_sets" ] ; then
-			SPOKEN_TARGET="package sets stats"
-		elif [ "$TARGET" = "repo_stats" ] ; then
-			SPOKEN_TARGET="apt repository stats"
-		else
-			SPOKEN_TARGET=${SPOKENTARGET[$TARGET]}
-		fi
+		SPOKEN_TARGET=${SPOKENTARGET[$TARGET]}
 		BASEURL="/$SUITE"
 		for i in $GLOBALVIEWS ; do
 			if [ "$TARGET" = "$i" ] ; then
diff --git a/bin/reproducible_html_dd_list.sh b/bin/reproducible_html_dd_list.sh
index bc2aa27e..2f61dc6c 100755
--- a/bin/reproducible_html_dd_list.sh
+++ b/bin/reproducible_html_dd_list.sh
@@ -19,7 +19,7 @@ VIEW=dd-list
 for $SUITE in $SUITES ; do
 	PAGE=$SUITE/index_${VIEW}.html
 	echo "$(date) - starting to write $PAGE page."
-	write_page_header $VIEW "Overview of ${SPOKENTARGET[$VIEW]}"
+	write_page_header $VIEW "Overview of maintainers of unreproducible packages in $SUITE"
 	TMPFILE=$(mktemp)
 	SOURCES=$(mktemp)
 	schroot --directory /tmp -c source:jenkins-reproducible-$SUITE cat /var/lib/apt/lists/*_source_Sources > $SOURCES || \
diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh
index aa2087fb..0a705d82 100755
--- a/bin/reproducible_html_graphs.sh
+++ b/bin/reproducible_html_graphs.sh
@@ -257,7 +257,7 @@ write_usertag_table() {
 VIEW=stats
 PAGE=index_${VIEW}.html
 echo "$(date) - starting to write $PAGE page."
-write_page_header $VIEW "Overview of ${SPOKENTARGET[$VIEW]}"
+write_page_header $VIEW "Overview of various statistics about reproducible builds for $SUITE"
 write_page "<p>"
 set_icon reproducible
 write_icon
@@ -306,7 +306,7 @@ fi
 VIEW=pkg_sets
 PAGE=index_${VIEW}.html
 echo "$(date) - starting to write $PAGE page."
-write_page_header $VIEW "Overview of ${SPOKENTARGET[$VIEW]}"
+write_page_header $VIEW "Overview about reproducible builds of specific package sets in $SUITE"
 write_page "<ul><li>Tracked package sets: </li>"
 for i in $(seq 1 ${#META_PKGSET[@]}) ; do
 	if [ -f /var/lib/jenkins/userContent/${TABLE[6]}_${META_PKGSET[$i]}.png ] ; then
diff --git a/bin/reproducible_html_repo_stats.sh b/bin/reproducible_html_repo_stats.sh
index 30cd1654..966b270c 100755
--- a/bin/reproducible_html_repo_stats.sh
+++ b/bin/reproducible_html_repo_stats.sh
@@ -19,7 +19,7 @@ PAGE=index_${VIEW}.html
 TMPFILE=$(mktemp)
 
 echo "$(date) - starting to write $PAGE page."
-write_page_header $VIEW "Overview of ${SPOKENTARGET[$VIEW]}"
+write_page_header $VIEW "Overview about the reproducible builds apt repository (and comparison to Debian suites)"
 write_page "<p>These source packages are different from sid in our apt repository on alioth. They are available for <a href=\"https://wiki.debian.org/ReproducibleBuilds/ExperimentalToolchain#Usage_example\">testing using these sources.lists</a> entries:<pre>"
 write_page "deb http://reproducible.alioth.debian.org/debian/ ./"
 write_page "deb-src http://reproducible.alioth.debian.org/debian/ ./"