Re: [Nano-devel] [PATCH 03/17] add support for gnulib

[Benno Schulenberg]

On Tue, Feb 21, 2017, at 23:04, Mike Frysinger wrote:
>  .gitignore      |  8 ++++++++
>  Makefile.am     |  2 +-
>  autogen.sh      | 26 ++++++++++++++++++++++++++
>  configure.ac    |  7 +++++++
>  m4/Makefile.am  |  1 +
>  src/Makefile.am |  5 +++--
>  6 files changed, 46 insertions(+), 3 deletions(-)

> diff --git a/autogen.sh b/autogen.sh
> index 540072239b4d..4e7ff142b2eb 100755
> --- a/autogen.sh
> +++ b/autogen.sh
> @@ -1,4 +1,30 @@
>  #!/bin/sh
>  # Generate configure & friends for GIT users.
>  
> +gnulib_url="git://git.sv.gnu.org/gnulib.git"
> +gnulib_hash="4084b3a1094372b960ce4a97634e08f4538c8bdd"
> +
> +modules="
> +     strcase
> +     strcasestr-simple
> +     strnlen
> +"
> +
> +# Make sure the local gnulib git repo is up-to-date.
> +if [ ! -d "gnulib" ]; then
> +     git clone --depth 1 ${gnulib_url}
> +fi
> +cd gnulib >/dev/null

If this fails...

> +curr_hash=$(git log -1 --format=%H)
> +if [ "${gnulib_hash}" != "${curr_hash}" ]; then
> +     git pull
> +     git checkout -f ${gnulib_hash}
> +fi
> +cd .. >/dev/null
> +
> +rm -rf lib

...it will wipe out any lib/ dir that happens to exist
one level up.

So I think the script should exit immediately if the
cd fails.  I've added " || exit 1" after the first cd.

Benno

-- 
http://www.fastmail.com - mmm... Fastmail...