From mboxrd@z Thu Jan  1 00:00:00 1970
From: lekensteyn at gmail.com (Peter Wu)
Date: Sat, 01 Feb 2014 15:06:21 +0100
Subject: [PATCH] gen-version.sh: check if git is available before trying
 to call it
In-Reply-To: <20140201135646.GA29976@serenity.lan>
References: <52EC2B82.7020300@jetable.org> <52ECF565.1030201@jetable.org>
 <20140201135646.GA29976@serenity.lan>
Message-ID: <3386636.h5ksx6Nyhk@al>

On Saturday 01 February 2014 13:56:46 John Keeping wrote:
> > diff --git a/gen-version.sh b/gen-version.sh
> > index 3a08015..13ff979 100755
> > --- a/gen-version.sh
> > +++ b/gen-version.sh
> > @@ -4,7 +4,7 @@
> >
> >  V=$1
> >  
> >  # Use `git describe` to get current version if we're inside a git repo
> >
> > -if test -d .git
> > +if test -d .git && command -v git > /dev/null
> 
> Style: no space between redirect and file: >/dev/null
> 
> I'm not sure command is the most portable way to achieve this, how about
> this instead:
> 
>     git --version >/dev/null 2>&1

If you are testing for git anyway, what about testing the result rather than 
the command:

    gitver=$(git describe --abbrev=4 HEAD 2>/dev/null)
    [ -z "$gitver" ] || V=$gitver

> >  then
> >       V=$(git describe --abbrev=4 HEAD 2>/dev/null)
> >  fi

Regards,
Peter