]> Savannah Git Hosting - gnulib.git/commitdiff
bootstrap-funclib.sh: Restore readability.
authorBruno Haible <bruno@clisp.org>
Sat, 29 Jun 2024 23:57:51 +0000 (01:57 +0200)
committerBruno Haible <bruno@clisp.org>
Sun, 30 Jun 2024 00:03:48 +0000 (02:03 +0200)
* top/bootstrap-funclib.sh (prepare_GNULIB_SRCDIR): Add a line break
instead of removing spaces.
* build-aux/bootstrap: Regenerated.

ChangeLog
build-aux/bootstrap
top/bootstrap-funclib.sh

index 86fae3c40801acbf16d102d7c92a0a15a23d69bb..5bb15c864c801c462eb0e73e1c0552754c405469 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-06-29  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        Global rename *zs[n]printf -> *s[n]zprintf.
index 56ffbe4dfce8ae448fc57c35b4133403307f5518..ac9433e3fd8054600210a20105c21415f872bc10 100755 (executable)
@@ -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
index 87f804eb16c9ed0d516a26f16a8d21020f828edd..5005d9b4a92096c217ed58363b029e578829131a 100644 (file)
@@ -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