--- ChangeLog | 1 + top/bootstrap | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog index b803e0a439..bcc1bbd933 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2023-07-01 Paul Eggert <egg...@cs.ucla.edu> Fix long bootstrap lines + * top/bootstrap: * top/bootstrap-funclib.sh: Reformat to fit into 80 columns, for coreutils ‘make syntax-check’. diff --git a/top/bootstrap b/top/bootstrap index 74af1b7e59..203c41925b 100755 --- a/top/bootstrap +++ b/top/bootstrap @@ -1,7 +1,7 @@ #! /bin/sh # Bootstrap this package from checked-out sources. -scriptversion=2022-12-27.07; # UTC +scriptversion=2023-07-01.18; # UTC # Copyright (C) 2003-2023 Free Software Foundation, Inc. # @@ -176,9 +176,11 @@ done $pull || $gen || pull=true gen=true $use_git || test -n "$GNULIB_SRCDIR" \ - || die "Error: --no-git requires \$GNULIB_SRCDIR environment variable or --gnulib-srcdir option" + || die "Error: --no-git requires \$GNULIB_SRCDIR environment variable" \ + "or --gnulib-srcdir option" test -z "$GNULIB_SRCDIR" || test -d "$GNULIB_SRCDIR" \ - || die "Error: \$GNULIB_SRCDIR environment variable or --gnulib-srcdir option is specified, but does not denote a directory" + || die "Error: \$GNULIB_SRCDIR environment variable or --gnulib-srcdir" \ + "option is specified, but does not denote a directory" if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then die "Bootstrapping from a non-checked-out distribution is risky." @@ -201,7 +203,11 @@ export GNULIB_REFDIR if $pull && { $use_git || test -z "$SKIP_PO"; }; then autopull \ - `if $bootstrap_sync; then echo ' --bootstrap-sync'; else echo ' --no-bootstrap-sync'; fi` \ + `if $bootstrap_sync; then + echo ' --bootstrap-sync' + else + echo ' --no-bootstrap-sync' + fi` \ `if test -z "$checkout_only_file"; then echo ' --force'; fi` \ `if ! $use_git; then echo ' --no-git'; fi` \ `if test -n "$SKIP_PO"; then echo ' --skip-po'; fi` \ -- 2.39.2