summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2016-05-09 18:37:02 -0400
committerLuke Shumaker <lukeshu@parabola.nu>2017-07-05 15:37:15 -0400
commiteb3e9087aa0723dde54c3b1bd813f617e71ddeab (patch)
treed8e53732e5ece9572a0c1d4796437b7874733a40
parent086ff8b9e7cc5a5cb57d230039a28354fe3f62f8 (diff)
downloaddevtools32-eb3e9087aa0723dde54c3b1bd813f617e71ddeab.tar.xz
arch-nspawn: Message style: two spaces after a period
This affects both the usage() text, and the error message if the `/.arch-chroot` version doesn't match. The latter is the one that I really care about, and motivates this change. On Parabola, the `arch-nspawn` program isn't in PATH, it's somewhere under `/usr/lib/`, and gets called as a helper to user-facing programs; and the error message is displayed directly to the user. These programs consistently put two spaces after a period when printing a message to the terminal.
-rw-r--r--arch-nspawn.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in
index c21b2ce..669bcfa 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -19,7 +19,7 @@ files=()
usage() {
echo "Usage: ${0##*/} [options] working-dir [systemd-nspawn arguments]"
- echo "A wrapper around systemd-nspawn. Provides support for pacman."
+ echo "A wrapper around systemd-nspawn. Provides support for pacman."
echo
echo ' options:'
echo ' -C <file> Location of a pacman config file'
@@ -101,7 +101,7 @@ umask 0022
if [[ ! -f "$working_dir/.arch-chroot" ]]; then
die "'%s' does not appear to be an Arch chroot." "$working_dir"
elif [[ $(cat "$working_dir/.arch-chroot") != "$CHROOT_VERSION" ]]; then
- die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION"
+ die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION"
fi
build_mount_args