From bd2252fb2ad26f3f271ddb4de4416c1d3f143e52 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 30 Jun 2024 01:57:51 +0200 Subject: [PATCH] bootstrap-funclib.sh: Restore readability. * top/bootstrap-funclib.sh (prepare_GNULIB_SRCDIR): Add a line break instead of removing spaces. * build-aux/bootstrap: Regenerated. --- ChangeLog | 7 +++++++ build-aux/bootstrap | 7 ++++--- top/bootstrap-funclib.sh | 7 ++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 86fae3c408..5bb15c864c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-06-29 Bruno Haible + + bootstrap-funclib.sh: Restore readability. + * top/bootstrap-funclib.sh (prepare_GNULIB_SRCDIR): Add a line break + instead of removing spaces. + * build-aux/bootstrap: Regenerated. + 2024-06-29 Bruno Haible Global rename *zs[n]printf -> *s[n]zprintf. diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 56ffbe4dfc..ac9433e3fd 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -37,7 +37,7 @@ medir=`dirname "$me"` # 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. # @@ -552,7 +552,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 @@ -573,7 +573,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 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 -- 2.39.5