From: john at keeping.me.uk (John Keeping)
Subject: [PATCH] gen-version.sh: check if git is available before trying to call it
Date: Sat, 1 Feb 2014 13:56:46 +0000 [thread overview]
Message-ID: <20140201135646.GA29976@serenity.lan> (raw)
In-Reply-To: <52ECF565.1030201@jetable.org>
On Sat, Feb 01, 2014 at 02:23:49PM +0100, Fabien C. wrote:
> On 01/02/2014 11:07, Jason A. Donenfeld wrote:
> > Maybe you want to direct the output to /dev/null?
>
> You're right, that was a too quick fix.
>
> Here you go with the /dev/null redirect.
> From 3dc2ce06df3ccbdae9c05325e93cbbcabc1d1b7f Mon Sep 17 00:00:00 2001
> From: Fabien C. <t74jgwb88tli9ch at jetable.org>
> Date: Sat, 1 Feb 2014 14:18:29 +0100
> Subject: [PATCH] gen-version.sh: check if git is available before trying to
> call it
>
> Some people may clone the cgit repository and compile within a sandbox
> or on another machine where git is not necessarily installed. When it
> happens, cgit is getting compiled with an empty version number.
>
> This commit fixes this.
> ---
> gen-version.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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
> then
> V=$(git describe --abbrev=4 HEAD 2>/dev/null)
> fi
> --
> 1.7.10.4
next prev parent reply other threads:[~2014-02-01 13:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-31 23:02 t74jgwb88tli9ch
[not found] ` <CAHmME9rwbdCfdeDYWcnKmyDjcsUQ_VaYF2755aHfbgUQeMNQQw@mail.gmail.com>
[not found] ` <52EC2C77.10503@jetable.org>
[not found] ` <CAHmME9qKOEU0Q+yAYUw5N4_AOS38bK4kHp2p8-MwYPGOh=ZOKg@mail.gmail.com>
2014-02-01 10:07 ` Jason
2014-02-01 13:23 ` t74jgwb88tli9ch
2014-02-01 13:56 ` john [this message]
2014-02-01 14:06 ` lekensteyn
2014-02-01 15:10 ` t74jgwb88tli9ch
2014-02-05 10:23 ` cgit
2014-02-05 14:09 ` Jason
-- strict thread matches above, loose matches on Subject: below --
2014-01-31 23:00 t74jgwb88tli9ch
2014-01-31 22:37 t74jgwb88tli9ch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140201135646.GA29976@serenity.lan \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).