From 294f2e1f6baf0a0b64b5ec5eb4316e62d6969656 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 14 May 2010 11:46:42 +0200 Subject: [PATCH] bootstrap: ensure gnulib_path is not empty. --- ChangeLog | 5 +++++ bootstrap | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 838d4376..24573530 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-05-14 Giuseppe Scrivano + + * bootstrap (gnulib_path): Default to "gnulib" if it doesn't have a + value. Redirect "git clone" stderr to stdout. + 2010-05-09 Giuseppe Scrivano * build-aux/bzr-version-gen: New file. diff --git a/bootstrap b/bootstrap index a9a778a8..b74bc0b7 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2010-04-30.16; # UTC +scriptversion=2010-05-14.09; # UTC # Bootstrap this package from checked-out sources. @@ -409,6 +409,7 @@ git_modules_config () { } gnulib_path=`git_modules_config submodule.gnulib.path` +test -n "$gnulib_path" || gnulib_path="gnulib" # Get gnulib files. @@ -424,7 +425,8 @@ case ${GNULIB_SRCDIR--} in trap cleanup_gnulib 1 2 13 15 - git clone -h|grep -- --depth > /dev/null && shallow='--depth 2' || shallow= + git clone 2>&1 -h|grep -- --depth > /dev/null \ + && shallow='--depth 2'|| shallow= git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" || cleanup_gnulib -- 2.39.2