Hi tech@,
We are using spacing after ellipses in displayed messages in an
inconsistant way.
A few examples:
- openssl: generating isakmpd/iked RSA keys... done.
- syncing disks... done
- iwm0: no link ..... got link
- iwm0: no lease ...... got lease
Another example, from syspatch:
- Relinking to create unique kernel... done.
In install.sub though, we find the same message for kernel relinking,
without a space this time:
- Relinking to create unique kernel...done.
And most messages with ellipses in install.sub are displayed without a
space, except for:
- Checking for available binary patches... done.
I propose to standardize on using "... " everywhere, and the following
diff enforces this for the installer.
Comments? OK?
Index: distrib/miniroot/install.sub
===================================================================
RCS file: /cvs/src/distrib/miniroot/install.sub,v
retrieving revision 1.1098
diff -u -p -r1.1098 install.sub
--- distrib/miniroot/install.sub 10 Jul 2018 14:22:36 -0000 1.1098
+++ distrib/miniroot/install.sub 14 Aug 2018 09:06:28 -0000
@@ -2515,7 +2515,7 @@ check_fs() {
# Make sure device exists before fsck'ing it.
make_dev "$_dn" || continue
((_passno > 0)) || continue
- echo -n "fsck -${_f}p $_dev..."
+ echo -n "fsck -${_f}p $_dev... "
if ! fsck -${_f}p $_dev >/dev/null 2>&1; then
echo "FAILED. You must fsck $_dev manually."
_fail=y
@@ -2716,7 +2716,7 @@ finish_up() {
echo "$INSTALL_URL" >/mnt/etc/installurl
fi
- echo -n "Making all device nodes..."
+ echo -n "Making all device nodes... "
(cd /mnt/dev; sh MAKEDEV all
# Make sure any devices we found during probe are created in the
# installed system.
@@ -2760,7 +2760,7 @@ finish_up() {
sha256 /mnt/bsd | (umask 077; sed 's,/mnt,,' >/mnt/var/db/kernel.SHA256)
if [[ -f $_kernel_dir.tgz ]]; then
- echo -n "Relinking to create unique kernel..."
+ echo -n "Relinking to create unique kernel... "
(
set -e
rm -rf $_kernel_dir
@@ -3029,7 +3029,7 @@ do_install() {
/mnt/etc/ttys >/tmp/i/ttys
mv /tmp/i/ttys /mnt/etc/ttys
- echo -n "Saving configuration files..."
+ echo -n "Saving configuration files... "
# Save any leases obtained during install.
(cd /var/db; for _f in dhclient.leases.*; do
@@ -3122,11 +3122,11 @@ do_upgrade() {
# Get $ROOTDISK and $ROOTDEV
get_rootinfo
- echo -n "Checking root filesystem (fsck -fp /dev/$ROOTDEV)..."
+ echo -n "Checking root filesystem (fsck -fp /dev/$ROOTDEV)... "
fsck -fp /dev/$ROOTDEV >/dev/null 2>&1 || { echo "FAILED."; exit; }
echo "OK."
- echo -n "Mounting root filesystem (mount -o ro /dev/$ROOTDEV /mnt)..."
+ echo -n "Mounting root filesystem (mount -o ro /dev/$ROOTDEV /mnt)... "
mount -o ro /dev/$ROOTDEV /mnt || { echo "FAILED."; exit; }
echo "OK."