From 3bfe6d5f28e8edff763682659567cabc21382ff3 Mon Sep 17 00:00:00 2001
From: Holger Levsen
Date: Mon, 19 Oct 2015 08:41:21 +0200
Subject: reproducible Arch Linux: correctly spell project name
---
bin/reproducible_arch_schroot_setup.sh | 4 ++--
bin/reproducible_build_arch_pkg.sh | 4 ++--
bin/reproducible_common.sh | 18 +++++++++---------
bin/reproducible_html_archlinux.sh | 10 +++++-----
job-cfg/reproducible.yaml | 8 ++++----
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/bin/reproducible_arch_schroot_setup.sh b/bin/reproducible_arch_schroot_setup.sh
index ea6786ce..dffe7ffd 100755
--- a/bin/reproducible_arch_schroot_setup.sh
+++ b/bin/reproducible_arch_schroot_setup.sh
@@ -18,7 +18,7 @@ ARCH_MIRROR=http://mirror.one.com/archlinux/
bootstrap() {
# define URL for bootstrap.tgz
BOOTSTRAP_BASE=$ARCH_MIRROR/iso/
- echo "$(date -u) - downloading Archlinux latest/sha1sums.txt"
+ echo "$(date -u) - downloading Arch Linux latest/sha1sums.txt"
BOOTSTRAP_DATE=$(curl $BOOTSTRAP_BASE/latest/sha1sums.txt 2>/dev/null| grep x86_64.tar.gz| cut -d " " -f3|cut -d "-" -f3|egrep '[0-9.]{9}')
if [ -z $BOOTSTRAP_DATE ] ; then
echo "Cannot determine version of boostrap file, aborting."
@@ -26,7 +26,7 @@ bootstrap() {
exit 1
fi
BOOTSTRAP_TAR_GZ=$BOOTSTRAP_DATE/archlinux-bootstrap-$BOOTSTRAP_DATE-x86_64.tar.gz
- echo "$(date -u) - downloading Archlinux bootstrap.tar.gz."
+ echo "$(date -u) - downloading Arch Linux bootstrap.tar.gz."
curl -O $BOOTSTRAP_BASE/$BOOTSTRAP_TAR_GZ
tar xzf archlinux-bootstrap-$BOOTSTRAP_DATE-x86_64.tar.gz
mv root.x86_64/* $SCHROOT_TARGET || true # proc and sys have 0555 perms, thus mv will fail... also see below
diff --git a/bin/reproducible_build_arch_pkg.sh b/bin/reproducible_build_arch_pkg.sh
index be634fa0..bf775e6f 100755
--- a/bin/reproducible_build_arch_pkg.sh
+++ b/bin/reproducible_build_arch_pkg.sh
@@ -40,7 +40,7 @@ handle_remote_error() {
first_build() {
echo "============================================================================="
- echo "Building ${SRCPACKAGE} for Archlinux on $(hostname -f) now."
+ echo "Building ${SRCPACKAGE} for Arch Linux on $(hostname -f) now."
echo "Date: $(date)"
echo "Date UTC: $(date -u)"
echo "============================================================================="
@@ -67,7 +67,7 @@ first_build() {
second_build() {
echo "============================================================================="
- echo "Re-Building ${SRCPACKAGE} for Archlinux on $(hostname -f) now."
+ echo "Re-Building ${SRCPACKAGE} for Arch Linux on $(hostname -f) now."
echo "Date: $(date)"
echo "Date UTC: $(date -u)"
echo "============================================================================="
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 84ff0e83..606c85b4 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -199,7 +199,7 @@ write_page_header() {
write_page " or send us an email,"
write_page " to get support for making sure your packages build reproducibly too. Also, we care about free software in general,"
write_page " so if you are an upstream developer or working on another distribution, we'd love to hear from you!"
- write_page " Besides Debian we are also testing coreboot, OpenWrt, NetBSD, FreeBSD and Archlinux now, though not as thoroughly as Debian (yet?) - and there are plans to test Fedora too."
+ write_page " Besides Debian we are also testing coreboot, OpenWrt, NetBSD, FreeBSD and Arch Linux now, though not as thoroughly as Debian (yet?) - and there are plans to test Fedora too."
write_page " As we think that reproducible builds should become the norm, we have started to write - How to make your software reproducible
. As always we appreciate feedback on this document, just please don't consider it to be finished, comprehensive or correct, yet."
write_page " Also aimed at the free software world at large, but released as version 1.0, is the first specication we have written: the - SOURCE_DATE_EPOCH specification
.
"
fi
@@ -288,11 +288,11 @@ write_page_intro() {
local PROJECTURL="https://github.com/freebsd/freebsd.git"
local BUILD_ENVIRONMENT=", which via ssh triggers a build on a FreeBSD 10.1 system"
local BRANCH="release/10.2.0"
- elif [ "$1" = "Archlinux" ] ; then
+ elif [ "$1" = "Arch Linux" ] ; then
write_page " Reproducible $1 is an effort to apply this to $1. Thus $1 packages are build twice, with a few varitations added and then the resulting packages from the two builds are then compared using diffoscope. Please note that the toolchain is not varied at all as the rebuild happens on exactly the same system. More variations are expected to be seen in the wild.
"
- local PROJECTNAME="Archlinux"
+ local PROJECTNAME="Arch Linux"
fi
- if [ "$1" != "Archlinux" ] ; then
+ if [ "$1" != "Arch Linux" ] ; then
write_page " There is a weekly run jenkins job to test the $BRANCH
branch of $PROJECTNAME.git. Currently this job is triggered more often though, because this is still under development and brand new. The jenkins job is running reproducible_$PROJECTNAME.sh$BUILD_ENVIRONMENT and this script is solely responsible for creating this page. Feel invited to join #debian-reproducible
(on irc.oftc.net) to request job runs whenever sensible. Patches and other feedback are very much appreciated - if you want to help, please start by looking at the ToDo list for $1, you might find something easy to contribute.
"
else
write_page " This is brand new and the test setup needs to be explained here.
"
@@ -307,7 +307,7 @@ write_page_footer() {
write_page "NetBSD® is a registered trademark of The NetBSD Foundation, Inc."
elif [ "$1" = "FreeBSD" ] ; then
write_page "FreeBSD is a registered trademark of The FreeBSD Foundation. The FreeBSD logo and The Power to Serve are trademarks of The FreeBSD Foundation."
- elif [ "$1" = "Archlinux" ] ; then
+ elif [ "$1" = "Arch Linux" ] ; then
write_page "The Arch Linux name and logo are recognized trademarks. Some rights reserved. The registered trademark Linux® is used pursuant to a sublicense from LMI, the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis."
fi
write_page "