Hi Jim,
> # The subdirectory 'gnulib' does not yet exist. Clone into it.
> echo "$0: getting gnulib files..."
> trap cleanup_gnulib HUP INT PIPE TERM
> + gnulib_url=${GNULIB_URL:-$default_gnulib_url}
> shallow=
> if test -z "$GNULIB_REVISION"; then
This variable is useful; thanks.
> || cleanup_gnulib
> git -C "$gnulib_path" reset --hard FETCH_HEAD
> - (cd "$gnulib_path" && git checkout "$GNULIB_REVISION") ||
> cleanup_gnulib
> + (cd "$gnulib_path" && git checkout
> "$GNULIB_REVISION")||cleanup_gnulib
> fi
> trap - HUP INT PIPE TERM
This one is not useful. The spaces help readability, and therefore help
maintainability. I am therefore fixing it up:
2024-06-29 Bruno Haible <[email protected]>
bootstrap-funclib.sh: Restore readability.
* top/bootstrap-funclib.sh (prepare_GNULIB_SRCDIR): Add a line break
instead of removing spaces.
* build-aux/bootstrap: Regenerated.
diff --git a/top/bootstrap-funclib.sh b/top/bootstrap-funclib.sh
index 87f804eb16..5005d9b4a9 100644
--- a/top/bootstrap-funclib.sh
+++ b/top/bootstrap-funclib.sh
@@ -1,6 +1,6 @@
# A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
-scriptlibversion=2024-04-28.09; # UTC
+scriptlibversion=2024-06-29.23; # UTC
# Copyright (C) 2003-2024 Free Software Foundation, Inc.
#
@@ -515,7 +515,7 @@ prepare_GNULIB_SRCDIR ()
if git clone -h 2>&1 | grep -- --depth > /dev/null; then
shallow='--depth 2'
fi
- git clone $shallow "$gnulib_url" "$gnulib_path"\
+ git clone $shallow "$gnulib_url" "$gnulib_path" \
|| cleanup_gnulib
else
if git fetch -h 2>&1 | grep -- --depth > /dev/null; then
@@ -536,7 +536,8 @@ prepare_GNULIB_SRCDIR ()
|| git -C "$gnulib_path" fetch origin \
|| cleanup_gnulib
git -C "$gnulib_path" reset --hard FETCH_HEAD
- (cd "$gnulib_path" && git checkout
"$GNULIB_REVISION")||cleanup_gnulib
+ (cd "$gnulib_path" && git checkout "$GNULIB_REVISION") \
+ || cleanup_gnulib
fi
trap - HUP INT PIPE TERM
else
